aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Expand)AuthorAge
* Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson2011-03-30
|\
| * Use cbt to tell when to launch parallel intro circuitNick Mathewson2011-03-30
| * Use timevals, not time_t, when expiring circuits.Nick Mathewson2011-03-30
| * Implement replacements for timer(add,cmp,sub) on platforms lacking them.Nick Mathewson2011-03-30
* | Merge remote branch 'origin/maint-0.2.2'Nick Mathewson2011-03-18
|\|
| * Fix signed/unsigned compare warningNick Mathewson2011-03-18
| * Merge remote branch 'sebastian/bug2696' into maint-0.2.2Nick Mathewson2011-03-18
| |\
| | * Futz with the clang patch a bit and tidy some geoip.c stuffNick Mathewson2011-03-17
| | * Fix two compile warnings when using clangSebastian Hahn2011-03-10
* | | Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson2011-03-16
|\| |
| * | Document a few more members.Nick Mathewson2011-03-16
| * | Resolve the one DOCDOC in the 0.2.2 code atmNick Mathewson2011-03-16
| * | Remove a useless doxygen commentNick Mathewson2011-03-16
| * | Move the decl for tor_gettimofday_cache_clear to the right headerNick Mathewson2011-03-16
* | | Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson2011-03-16
|\| |
| * | Clean up whitespaceNick Mathewson2011-03-16
* | | Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson2011-03-16
|\| |
| * | Doxygen documentation for about 100 things that didn't have anyNick Mathewson2011-03-16
| * | Fix up all doxygen warnings other than "foo is not documented"Nick Mathewson2011-03-16
* | | Merge remote branch 'arma/optimistic_server'Nick Mathewson2011-03-15
|\ \ \
| * | | whitespace fixes to pass 'make check-spaces'Roger Dingledine2011-03-15
| * | | Revise prop174 patch: make the circuit sendme calls unconditional.Nick Mathewson2011-03-14
| * | | Implement server side of Proposal 174 (optimistic data)Ian Goldberg2011-03-14
* | | | Merge remote branch 'origin/maint-0.2.2'Nick Mathewson2011-03-15
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'bug2756_relay' into maint-0.2.2Nick Mathewson2011-03-15
| |\ \ \
| | * | | Fix comment for connection_edge_consider_sending_sendmeNick Mathewson2011-03-15
| | * | | Consider sending stream-level SENDME cells on partial flushes.Nick Mathewson2011-03-14
* | | | | Merge remote branch 'origin/maint-0.2.2'Nick Mathewson2011-03-15
|\| | | |
| * | | | Merge branch 'bug2757' into maint-0.2.2Nick Mathewson2011-03-15
| |\ \ \ \
| | * | | | Check newconn, not conn, before marking newconn for closeNick Mathewson2011-03-14
| | |/ / /
* | | | | Merge remote branch 'origin/maint-0.2.2'Nick Mathewson2011-03-15
|\| | | |
| * | | | Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2Nick Mathewson2011-03-15
| |\ \ \ \
| | * | | | Fix a compile warning when using clangSebastian Hahn2011-03-15
* | | | | | Merge remote branch 'origin/maint-0.2.2'Nick Mathewson2011-03-15
|\| | | | | | |_|_|/ / |/| | | |
| * | | | Fix a log message typoRobert Ransom2011-03-15
| * | | | Log the source of a rejected POSTed v3 voteRobert Ransom2011-03-15
| | |/ / | |/| |
* | | | clarify log messages based on suggestion from armaNick Mathewson2011-03-14
* | | | Merge remote branch 'origin/maint-0.2.2'Nick Mathewson2011-03-14
|\| | |
| * | | Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2Nick Mathewson2011-03-14
| |\| |
| | * | we're not reachable if we don't have a routerinfo yetRoger Dingledine2011-03-13
* | | | finish a commentNick Mathewson2011-03-14
* | | | Merge remote branch 'origin/maint-0.2.2'Nick Mathewson2011-03-14
|\| | |
| * | | Merge remote branch 'arma/bug2510' into maint-0.2.2Nick Mathewson2011-03-14
| |\ \ \
| | * \ \ Merge branch 'bug2511' into bug2510Roger Dingledine2011-03-14
| | |\ \ \
| | | * | | fix two issues pointed out by nickmRoger Dingledine2011-03-13
| | * | | | support multihomed bridges (bug 2510)Roger Dingledine2011-02-08
| | |/ / /
| | * | | don't use old non-configured bridges (bug 2511)Roger Dingledine2011-02-08
* | | | | Merge remote branch 'origin/maint-0.2.2'Nick Mathewson2011-03-14
|\| | | |
| * | | | Merge remote branch 'arma/bug2716' into maint-0.2.2Nick Mathewson2011-03-14
| |\ \ \ \
| | * | | | fix one more typoRoger Dingledine2011-03-13