summaryrefslogtreecommitdiff
path: root/src/or
AgeCommit message (Expand)Author
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 'public/bug2381'Nick 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-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-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-17Futz with the clang patch a bit and tidy some geoip.c stuffNick Mathewson
2011-03-16Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson
2011-03-16Document a few more members.Nick Mathewson
2011-03-16Remove a useless doxygen commentNick Mathewson
2011-03-16Move the decl for tor_gettimofday_cache_clear to the right headerNick Mathewson
2011-03-16Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson
2011-03-16Doxygen documentation for about 100 things that didn't have anyNick Mathewson
2011-03-16Fix up all doxygen warnings other than "foo is not documented"Nick Mathewson
2011-03-15Merge remote branch 'arma/optimistic_server'Nick Mathewson
2011-03-15Merge remote branch 'origin/maint-0.2.2'Nick Mathewson
2011-03-15Merge branch 'bug2756_relay' into maint-0.2.2Nick Mathewson
2011-03-15whitespace fixes to pass 'make check-spaces'Roger Dingledine
2011-03-15Fix comment for connection_edge_consider_sending_sendmeNick Mathewson
2011-03-15Merge remote branch 'origin/maint-0.2.2'Nick Mathewson
2011-03-15Merge branch 'bug2757' into maint-0.2.2Nick Mathewson
2011-03-15Merge remote branch 'origin/maint-0.2.2'Nick Mathewson
2011-03-15Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2Nick Mathewson
2011-03-15Fix a compile warning when using clangSebastian Hahn
2011-03-15Merge remote branch 'origin/maint-0.2.2'Nick Mathewson
2011-03-15Fix a log message typoRobert Ransom
2011-03-15Log the source of a rejected POSTed v3 voteRobert Ransom
2011-03-14Check newconn, not conn, before marking newconn for closeNick Mathewson
2011-03-14Revise prop174 patch: make the circuit sendme calls unconditional.Nick Mathewson
2011-03-14Implement server side of Proposal 174 (optimistic data)Ian Goldberg
2011-03-14Consider sending stream-level SENDME cells on partial flushes.Nick Mathewson
2011-03-14clarify log messages based on suggestion from armaNick Mathewson
2011-03-14Merge remote branch 'origin/maint-0.2.2'Nick Mathewson
2011-03-14Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2Nick Mathewson
2011-03-14finish a commentNick Mathewson
2011-03-14Merge remote branch 'origin/maint-0.2.2'Nick Mathewson
2011-03-14Merge remote branch 'arma/bug2510' into maint-0.2.2Nick Mathewson
2011-03-14Merge branch 'bug2511' into bug2510Roger Dingledine
2011-03-14Merge remote branch 'origin/maint-0.2.2'Nick Mathewson
2011-03-14Merge remote branch 'arma/bug2716' into maint-0.2.2Nick Mathewson
2011-03-13fix two issues pointed out by nickmRoger Dingledine
2011-03-13we're not reachable if we don't have a routerinfo yetRoger Dingledine