commit b9d11bd87c292ef4a7bb785ef305a59afab37865 Merge: 63bef6c eb5d75e Author: Roger Dingledine arma@torproject.org Date: Thu Oct 10 21:42:33 2013 -0400
Merge branch 'maint-0.2.4' into release-0.2.4
ChangeLog | 5 +- changes/9854 | 3 + changes/bug6979 | 4 + changes/bug9596 | 4 + changes/bug9644 | 4 + changes/bug9880 | 8 + changes/bug9904 | 4 + changes/bug9927 | 4 + changes/bug9928 | 6 + changes/ticket9866 | 3 + doc/tor.1.txt | 554 +++++++++++++++++++++++++------------------------- src/common/address.c | 2 + src/common/util.c | 12 +- src/or/channel.c | 7 +- src/or/channel.h | 3 + src/or/directory.c | 2 + src/or/policies.h | 7 +- src/or/relay.c | 1 + src/or/router.c | 2 +- src/or/routerlist.c | 29 ++- src/test/test_util.c | 1 + 21 files changed, 369 insertions(+), 296 deletions(-)