aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Expand)AuthorAge
* Merge branch 'tor-fw-squashed2'Nick Mathewson2010-09-30
|\
| * Fix space and formatting issuesNick Mathewson2010-09-30
| * #if-out the fw-helper code in util.c when building on windowsNick Mathewson2010-09-30
| * Turn select() usage in tor-fw-helper into a function.Nick Mathewson2010-09-30
| * Start tor-fw-helper in the background, and log whatever it outputsSteven Murdoch2010-09-30
| * Changes to tor-fw-helper, some based on Nick's reviewJacob Appelbaum2010-09-30
| * First implementation of tor-fw-helper.Jacob Appelbaum2010-09-30
* | Merge remote branch 'origin/maint-0.2.2'Nick Mathewson2010-09-30
|\ \ | |/ |/|
| * Note an XXX about potential overflowSebastian Hahn2010-09-30
| * Use an upper and lower bound for bridge weightsSebastian Hahn2010-09-30
| * Fix check-spacesSebastian Hahn2010-09-30
* | Whitespace fixes on recent merges to master.Nick Mathewson2010-09-30
* | Merge branch 'maint-0.2.2'Roger Dingledine2010-09-30
|\|
| * Merge commit 'mikeperry/bug1772' into maint-0.2.2Roger Dingledine2010-09-30
| |\
| | * Nominaly lower the minimum timeout value to 1500.Mike Perry2010-09-29
| * | Merge branch 'bug1772' into maint-0.2.2Roger Dingledine2010-09-29
| |\ \
| | * | fix two castsRoger Dingledine2010-09-29
| | |/
| | * Comment network liveness and change detection behavior.Mike Perry2010-09-29
| | * no measurement circs if not enough build timesRoger Dingledine2010-09-29
| | * refactor and recomment; no actual changesRoger Dingledine2010-09-29
| | * Cap the circuit build timeout to the max time we've seen.Mike Perry2010-09-29
| | * Do away with the complexity of the network liveness detection.Mike Perry2010-09-29
| | * Fix state checks on liveness handling.Mike Perry2010-09-29
| | * Fix non-live condition checks.Mike Perry2010-09-29
* | | Merge branch 'maint-0.2.2'Roger Dingledine2010-09-29
|\| |
| * | Merge commit 'mikeperry/bug1739' into maint-0.2.2Roger Dingledine2010-09-29
| |\|
| | * Send control port events for timeouts.Mike Perry2010-09-29
| * | Merge commit 'mikeperry/bug1740' into maint-0.2.2Roger Dingledine2010-09-29
| |\|
| | * Only count timeout data for 3 hop circuits.Mike Perry2010-09-29
* | | make c612ddee compile with old libeventsRoger Dingledine2010-09-29
* | | Merge remote branch 'origin/maint-0.2.2'Nick Mathewson2010-09-29
|\| |
| * | even more commentRoger Dingledine2010-09-28
| * | improve code comments, based on comments from nickRoger Dingledine2010-09-28
| * | handle ugly edge case in retrying entrynodesRoger Dingledine2010-09-28
| * | Actually notice when our last entrynode goes downRoger Dingledine2010-09-28
| * | optimistically retry EntryNodes on socks requestRoger Dingledine2010-09-28
| * | remove a redundant assertRoger Dingledine2010-09-28
| * | refactor; no actual changesRoger Dingledine2010-09-28
* | | Remove the has_old_dnsworkers flag.Nick Mathewson2010-09-28
* | | Merge branch 'maint-0.2.2'Roger Dingledine2010-09-28
|\| |
| * | Merge branch 'maint-0.2.1' into maint-0.2.2Roger Dingledine2010-09-28
| |\ \
| | * | actually retry bridges when your network goes awayRoger Dingledine2010-09-28
* | | | Autodetect the number of CPUs when possible if NumCPUs==0Nick Mathewson2010-09-28
* | | | Add a new option to enable/disable IOCP supportNick Mathewson2010-09-28
* | | | Merge branch 'microdesc_dl_v2'Nick Mathewson2010-09-28
|\ \ \ \
| * | | | Clean long-unlisted microdescs from the cacheNick Mathewson2010-09-27
| * | | | Download microdescriptors if you're a cacheNick Mathewson2010-09-27
| * | | | When updating routerdesc downloads, look specifically at the ns consensusNick Mathewson2010-09-27
| * | | | Actually parse the m lines from a microdesc consensusNick Mathewson2010-09-27
| * | | | Code to download, parse, and store microdesc consensusesNick Mathewson2010-09-27