aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Initial work to set CLOEXEC on all possible fdsNick Mathewson2010-11-20
| | | | Still to go: some pipes, all stdio files.
* Merge remote branch 'origin/maint-0.2.2'Nick Mathewson2010-11-19
|\ | | | | | | | | Conflicts: src/or/router.c
| * Fix a unit test broken by fix for 2195Nick Mathewson2010-11-19
| |
| *-. Merge branch 'fix2183', remote branch 'rransom/fix2195-v2' into maint-0.2.2Nick Mathewson2010-11-19
| |\ \
| | | * Add changes file for bug2195.Robert Ransom2010-11-19
| | | |
| | | * Fix logic error in router_dump_router_to_string.Robert Ransom2010-11-19
| | | | | | | | | | | | | | | | Spotted by Nick Mathewson.
| | | * Generate a router descriptor even if generating an extra-info descriptor fails.Robert Ransom2010-11-17
| | | | | | | | | | | | | | | | Fixes bug #2195.
| | | * Do not emit an extra-info-digest descriptor line if the digest is zero.Robert Ransom2010-11-17
| | | |
| | * | Add comments to some of the bug2183 fix codeNick Mathewson2010-11-19
| | | |
| | * | Tweak the bugfix for 2183 a bit more.Karsten Loesing2010-11-17
| | | |
| | * | Don't use log_err for non-criticial warnings.Karsten Loesing2010-11-15
| | | |
| | * | Try harder not to exceed the 50 KB extra-info descriptor limit.Karsten Loesing2010-11-15
| | |/ | | | | | | | | | | | | | | | Our checks that we don't exceed the 50 KB size limit of extra-info descriptors apparently failed. This patch fixes these checks and reserves another 250 bytes for appending the signature. Fixes bug 2183.
* | | Merge commit 'c643e0527c186b8ef2d259b2ef11a10c1d4ee3e5'Nick Mathewson2010-11-19
|\| | | | | | | | | | | | | | | | | | | | Conflicts: configure.in contrib/tor-mingw.nsi.in src/win32/orconfig.h
| * | new development versionRoger Dingledine2010-11-16
| | |
| * | final touchupsRoger Dingledine2010-11-16
| | |
* | | Fix wide lines in SIGNAL patchNick Mathewson2010-11-19
| | |
* | | Add a changes file for SIGNAL eventsNick Mathewson2010-11-19
| | |
* | | Add some caveats to the signal eventNick Mathewson2010-11-19
| | |
* | | Add a SIGNAL event for control connectionsJohn Brooks2010-11-19
| | | | | | | | | | | | Implements ticket #1955
* | | Merge branch 'maint-0.2.2'Roger Dingledine2010-11-16
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.in contrib/tor-mingw.nsi.in src/win32/orconfig.h
| * | bump to 0.2.2.18-alphaRoger Dingledine2010-11-16
| | |
* | | 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
|\ \ \ \