aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Expand)AuthorAge
* 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
| | * | | Tweak bug2716 patch a littleNick Mathewson2011-03-12
| | * | | improve accuracy for when a relay went unreachableRoger Dingledine2011-03-11
* | | | | Merge remote branch 'origin/maint-0.2.2'Nick Mathewson2011-03-11
|\| | | |
| * | | | Merge branch 'hsdir_assignment' into maint-0.2.2Nick Mathewson2011-03-11
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Clarify threat description and avoid negative uptimes.Nick Mathewson2011-03-11
| | * | | Use observed instead of declared uptime for HSDirSebastian Hahn2011-03-11
| * | | | Merge commit 'sebastian/bug2663' into maint-0.2.2Roger Dingledine2011-03-11
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Fix log message when we have too few dirauthsSebastian Hahn2011-03-07
* | | | | Merge branch 'maint-0.2.2'Roger Dingledine2011-03-08
|\| | | |
| * | | | Merge branch 'maint-0.2.1' into maint-0.2.2Roger Dingledine2011-03-08
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | move to march 2011 geoip fileRoger Dingledine2011-03-08
* | | | | Merge remote branch 'origin/maint-0.2.2'Nick Mathewson2011-03-08
|\| | | |
| * | | | Merge remote branch 'sebastian/bug2250' into maint-0.2.2Nick Mathewson2011-03-08
| |\ \ \ \
| | * | | | Tweak the bug2250 fix slightlySebastian Hahn2011-03-01
| | * | | | Fix GETINFO config-text for private networksSebastian Hahn2011-02-26
* | | | | | Merge remote branch 'origin/maint-0.2.2'Nick Mathewson2011-03-08
|\| | | | |
| * | | | | Merge remote branch 'sebastian/bug1035' into maint-0.2.2Nick Mathewson2011-03-08
| |\ \ \ \ \
| | * | | | | clarify an assertSebastian Hahn2011-02-26
| | * | | | | Routers count as down when they change ORPort, tooSebastian Hahn2011-02-08
| | * | | | | Fix spelling and an unused #defineSebastian Hahn2011-02-07
| | * | | | | Fix compile without warnings on OS X 10.6Sebastian Hahn2010-12-27
| | * | | | | Handle negative run lengths in wfu/mtbf calculationsNick Mathewson2010-11-22
| | * | | | | Treat routers whose IPs have changed as having been down for MTBF/routerinfoNick Mathewson2010-11-22