commit 33c82ebf51cf2dc106e5de788111e775533aa76a Merge: f5541ea 4bd90e2 Author: Roger Dingledine arma@torproject.org Date: Tue Sep 4 19:05:31 2012 -0400

Merge branch 'maint-0.2.3' into release-0.2.3

changes/bug6244_part_c | 6 + changes/bug6251 | 6 + changes/bug6252_again | 11 ++ changes/bug6379 | 6 + changes/bug6404 | 16 +++ changes/bug6423 | 3 + changes/bug6472 | 4 + changes/bug6475 | 6 + changes/bug6507 | 15 +++ changes/bug6514 | 5 + changes/bug6690 | 7 + changes/bug6710 | 6 + changes/bug6732 | 3 + changes/disable_pathbias_messages | 3 + configure.in | 1 + doc/tor.1.txt | 17 +++- src/common/OpenBSD_malloc_Linux.c | 40 +++++-- src/or/circuitbuild.c | 249 +++++++++++++++++++++++++++++++------ src/or/config.c | 226 ++++++++++++++++++++++----------- src/or/config.h | 5 + src/or/control.c | 15 ++- src/or/directory.c | 2 +- src/or/directory.h | 2 +- src/or/dirserv.c | 12 +- src/or/dirvote.c | 49 +++++--- src/or/dns.c | 16 ++- src/or/microdesc.c | 9 +- src/or/or.h | 60 ++++++++-- src/or/policies.c | 6 +- src/or/relay.c | 14 ++ src/or/router.c | 5 +- src/or/routerlist.c | 2 + src/or/routerparse.c | 7 +- 33 files changed, 660 insertions(+), 174 deletions(-)