summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
* | | | | | | Merge branch 'maint-0.2.2'Roger Dingledine2010-11-16
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | warn more about AllowSingleHopExitsRoger Dingledine2010-11-16
| | | | | | |
| * | | | | | merge in more changelog entriesRoger Dingledine2010-11-15
| | | | | | |
| * | | | | | Merge commit 'nickm/1776_redux_v1' into maint-0.2.2Roger Dingledine2010-11-15
| |\ \ \ \ \ \
| | * | | | | | Clean up my 1776 fix a bitNick Mathewson2010-11-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sebastian notes (and I think correctly) that one of our ||s should have been an &&, which simplifies a boolean expression to decide whether to replace bridges. I'm also refactoring out the negation at the start of the expression, to make it more readable.
| | * | | | | | Bulletproof the routerlist manipulation functions to handle reinserting the ↵Nick Mathewson2010-11-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | same descriptor
| | * | | | | | Fix the assert in bug 1776Nick Mathewson2010-11-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the case where old_router == NULL but sdmap has an entry for the router, we can currently safely infer that the old_router was not a bridge. Add an assert to ensure that this remains true, and fix the logic not to die with the tor_assert(old_router) call.
* | | | | | | | Merge remote branch 'origin/maint-0.2.2'Nick Mathewson2010-11-15
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Move controller event for socks warning into log_unsafe_socks_warningNick Mathewson2010-11-15
| | | | | | | |
* | | | | | | | Merge remote branch 'origin/maint-0.2.2'Nick Mathewson2010-11-15
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/or/buffers.c
| * | | | | | | Merge branch 'bug2000_nm_022' into maint-0.2.2Nick Mathewson2010-11-15
| |\ \ \ \ \ \ \
| | * | | | | | | Rate-limit unsafe socks warningSebastian Hahn2010-11-15
| | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pick 5 seconds as the limit. 5 seconds is a compromise here between making sure the user notices that the bad behaviour is (still) happening and not spamming their log too much needlessly (the log message is pretty long). We also keep warning every time if safesocks is specified, because then the user presumably wants to hear about every blocked instance. (This is based on the original patch by Sebastian, then backported to 0.2.2 and with warnings split into their own function.)
* | | | | | | | Merge remote branch 'origin/maint-0.2.2'Nick Mathewson2010-11-15
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | changes entry for nopublish removal in 5040c855dNick Mathewson2010-11-15
| | | | | | | |
* | | | | | | | Merge remote branch 'origin/maint-0.2.2'Nick Mathewson2010-11-15
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/or/config.c src/or/cpuworker.c
| * | | | | | | Make the coducmentation for SingleHop stuff slightly more direNick Mathewson2010-11-15
| | | | | | | |
| * | | | | | | Merge remote branch 'sebastian/manpagefixups' into maint-0.2.2Nick Mathewson2010-11-15
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Document hs dht min uptime change in privnetsSebastian Hahn2010-11-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In f87c6f100d2faf8d we made it so that MinUptimeHidServDirectoryV2 defaults to 0 if TestingTorNetwork is set. Add a manpage entry and a changes file.
| | * | | | | | Document the AllowSingleHopExits optionSebastian Hahn2010-11-10
| | | | | | | |
| | * | | | | | Improve documentation for RelayBandwdith* optionsSebastian Hahn2010-11-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Jesse Adelman noticed that we don't currently describe what happens very well.
| | * | | | | | Add V3BandwidthsFile to the manpageSebastian Hahn2010-11-10
| | | | | | | |
| | * | | | | | Break NoPublish supportSebastian Hahn2010-11-10
| | | | | | | |
| | * | | | | | Change Natd into NATD in our options.Sebastian Hahn2010-11-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Breaking this out of the last commit because this might be more controversial.
| | * | | | | | Synx manpage and source wrt option capitalizationSebastian Hahn2010-11-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We had a spelling discrepancy between the manpage and the source code for some option. Resolve these in favor of the manpage, because it makes more sense (for example, HTTP should be capitalized).
| | * | | | | | Comment out the (unused) RunTesting optionSebastian Hahn2010-11-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The code that makes use of the RunTesting option is #if 0, so setting this option has no effect. Mark the option as obsolete for now, so that Tor doesn't list it as an available option erroneously.
| | * | | | | | Fix a typo in the manpageSebastian Hahn2010-11-10
| | | | | | | |
| | * | | | | | Remove the torrc.complete file.Sebastian Hahn2010-11-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We haven't been keeping it up to date, and the manpage exists as a replacement for users who want an overview of all available options.
| | * | | | | | Change checkOptionDocs.pl to be case sensitiveSebastian Hahn2010-11-10
| | | | | | | |
* | | | | | | | Merge remote branch 'karsten/enhancement1883'Nick Mathewson2010-11-12
|\ \ \ \ \ \ \ \
| * | | | | | | | Add two fixes to the new geoip-db-digest line.Karsten Loesing2010-11-12
| | | | | | | | |
| * | | | | | | | Add GeoIP file digest to extra-info descriptor.Karsten Loesing2010-11-09
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge remote branch 'origin/maint-0.2.2'Nick Mathewson2010-11-12
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Avoid perma-blocking the controller on bug in shrink_freelistNick Mathewson2010-11-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In all likelihood, this bug would make Tor assert, but if it doesn't, let's not have two bugs.
| * | | | | | | Add changes file for bug1125Nick Mathewson2010-11-12
| | | | | | | |
| * | | | | | | Merge remote branch 'rransom/bug1125-022' into maint-0.2.2Nick Mathewson2010-11-12
| |\ \ \ \ \ \ \
| | * | | | | | | Disable logging to control port connections in buf_shrink_freelists.Robert Ransom2010-11-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If buf_shrink_freelists calls log_warn for some reason, we don't want the log call itself to throw buf_shrink_freelists further off the rails.
| | * | | | | | | Move the original log_info call out of the core of buf_shrink_freelists.Robert Ransom2010-11-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sending a log message to a control port can cause Tor to allocate a buffer, thereby changing the length of the freelist behind buf_shrink_freelists's back, thereby causing an assertion to fail. Fixes bug #1125.
| * | | | | | | | Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2Nick Mathewson2010-11-12
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | / / / | | | |_|_|/ / / | | |/| | | | |
| | * | | | | | Add changes file for bug1125Nick Mathewson2010-11-12
| | | | | | | |
| | * | | | | | Disable logging to control port connections in buf_shrink_freelists.Robert Ransom2010-11-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If buf_shrink_freelists calls log_warn for some reason, we don't want the log call itself to throw buf_shrink_freelists further off the rails.
| | * | | | | | Move the original log_info call out of the core of buf_shrink_freelists.Robert Ransom2010-11-12
| | | |_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sending a log message to a control port can cause Tor to allocate a buffer, thereby changing the length of the freelist behind buf_shrink_freelists's back, thereby causing an assertion to fail. Fixes bug #1125.
* | | | | | | Stop linking src/tools/* against libeventNick Mathewson2010-11-11
| | | | | | |
* | | | | | | Merge remote branch 'public/refactor_pports'Nick Mathewson2010-11-11
|\ \ \ \ \ \ \
| * | | | | | | Make the predicted ports logic a little simpler.Nick Mathewson2010-10-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mainly, this comes from turning two lists that needed to be kept in synch into a single list of structs. This should save a little RAM, and make the code simpler.
* | | | | | | | Fix up tor-fw-helper "INCLUDES" directiveNick Mathewson2010-11-11
| | | | | | | |
* | | | | | | | Split long lines in configure.in and Makefile.am filesNick Mathewson2010-11-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Having very long single lines with lots and lots of things in them tends to make files hard to diff and hard to merge. Since our tools are one-line-at-a-time, we should try to construct lists that way too, within reason. This incidentally turned up a few headers in configure.in that we were for some reason searching for twice.
* | | | | | | | Merge remote branch 'origin/maint-0.2.2'Nick Mathewson2010-11-11
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.in
| * | | | | | | Merge remote branch 'sebastian/remove-osx-expert-package' into maint-0.2.2Nick Mathewson2010-11-11
| |\ \ \ \ \ \ \
| | * | | | | | | Remove everything related to os x expert packageSebastian Hahn2010-11-10
| | | |_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We decided to no longer ship expert packages for OS X because they're a lot of trouble to keep maintained and confuse users. For those who want a tor on OS X without Vidalia, macports is a fine option. Alternatively, building from source is easy, too. The polipo stuff that is still required for the Vidalia bundle build can now be found in the torbrowser repository, git://git.torproject.org/torbrowser.git.
* | | | | | | | Merge branch 'maint-0.2.2'Roger Dingledine2010-11-11
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/or/config.c
generated by cgit v1.2.1 (git 2.18.0) at 2024-02-08 07:54:18 +0000