commit 4e0bd2428740bda66597606b0ba04b5346ab49fd Merge: 5059627 9e44df2 Author: Roger Dingledine arma@torproject.org Date: Wed Apr 23 13:47:07 2014 -0400
Merge branch 'maint-0.2.4' into release-0.2.4
changes/bug11437 | 3 +++ changes/bug11464_023 | 5 +++++ changes/bug11519 | 3 +++ changes/bug9213_doc | 5 +++++ changes/bug9229 | 5 +++++ changes/bug9393 | 4 ++++ changes/bug9700 | 3 +++ doc/tor.1.txt | 5 ++++- src/or/circuituse.c | 2 +- src/or/config.c | 2 +- src/or/connection_edge.c | 1 - src/or/dns.c | 1 + src/or/entrynodes.c | 6 +++++- src/or/networkstatus.c | 11 +++++++++++ src/or/routerlist.c | 44 +++++++++++++++++++++++++++++++------------- src/or/routerlist.h | 1 + src/or/routerparse.c | 8 ++++++++ src/test/test.c | 2 +- 18 files changed, 92 insertions(+), 19 deletions(-)