summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2011-04-07Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson
2011-04-07Use GetTempDir instead of hardcoded path to c:\windows\tmp for unittestsGisle Vanem
2011-04-07Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson
2011-04-07Merge remote-tracking branch 'public/xxx_fixups' into maint-0.2.2Nick Mathewson
2011-04-07Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson
2011-04-07Allow controllers a more up-to-date view of bridge usage.Nick Mathewson
2011-04-07Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson
2011-04-07Fix a compile warning on OS X 10.6Sebastian Hahn
2011-04-06Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson
2011-04-06Merge remote-tracking branch 'public/bug2381'Nick Mathewson
2011-04-06Merge maint-0.2.1 for bug2402_again fixes . Use "-s ours" so we don't actual...Nick Mathewson
2011-04-06Merge remote-tracking branch 'public/bug2402_again' into maint-0.2.1Nick Mathewson
2011-04-06Add a missing ! to the check for CountPrivatebandwidth.Nick Mathewson
2011-04-05Tweaks to Cagara's CountPrivateBandwidth patch:Nick Mathewson
2011-04-05Patch from cagara: Add a CountPrivateBandwidth flagDaniel Cagara
2011-04-04remove duplicate changes file for 2702Nick Mathewson
2011-04-04Merge branch 'static-work'Nick Mathewson
2011-04-04Changes file for static-work branchNick Mathewson
2011-04-04Merge branch 'maint-0.2.2'Roger Dingledine
2011-04-04Merge branch 'maint-0.2.1' into maint-0.2.2Roger Dingledine
2011-04-04switch to the apr 2011 geoip dbRoger Dingledine
2011-04-02Small fixes for the 2702 implementationSebastian Hahn
2011-04-02add --enable-static-tor to our configure scriptJacob Appelbaum
2011-03-30Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson
2011-03-30Use cbt to tell when to launch parallel intro circuitNick Mathewson
2011-03-30Use timevals, not time_t, when expiring circuits.Nick Mathewson
2011-03-30Implement replacements for timer(add,cmp,sub) on platforms lacking them.Nick Mathewson
2011-03-28Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2Nick Mathewson
2011-03-28Fix configure.in zlib package names.Erinn Clark
2011-03-28Send END_STREAM_REASON_NOROUTE: clients that didn't grok it are now obsoleteNick Mathewson
2011-03-28Improve a few commentsSebastian Hahn
2011-03-28Add a missing cast to silence the compilerSebastian Hahn
2011-03-28Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson
2011-03-27Small tweaks for bug2698 bugfixSebastian Hahn
2011-03-27Fix libevent autoconf bug #2698Jacob Appelbaum
2011-03-25Fix handling of StreamID exhaustion.Nick Mathewson
2011-03-25Add XXX023s for our timestamp_dirty abuse.Nick Mathewson
2011-03-25Clarify some documentation and comments wrt resetting OR token bucketsNick Mathewson
2011-03-25Remove workaround code for bug539Nick Mathewson
2011-03-25Fix some 'impossible' overflow bugs in byte countingNick Mathewson
2011-03-25Look at the right errno when sending reason for connect() failureNick Mathewson
2011-03-25Triage the XXX022 and XXX021 comments remaining in the codeNick Mathewson
2011-03-25Comment out ancient asserts for bug 930; resolve an xxx021Nick Mathewson
2011-03-25Fixup tor_addr_to_sockaddr return conventionNick Mathewson
2011-03-25Clean up a comment-conversation about bad libevent version/method combosNick Mathewson
2011-03-25Remove the "fuzzy time" codeNick Mathewson
2011-03-18Merge remote branch 'origin/maint-0.2.2'Nick Mathewson
2011-03-18Fix signed/unsigned compare warningNick Mathewson
2011-03-18Merge remote branch 'sebastian/bug2696' into maint-0.2.2Nick Mathewson
2011-03-18Add 2696 changes fileSebastian Hahn