commit bffe0d3ccc6b49975eae9173b0c1c465d40d2dbf Merge: 443e4ae 45b520b Author: Nick Mathewson nickm@torproject.org Date: Mon Aug 27 16:15:01 2012 -0400

Merge branch 'bug6710_023' into maint-0.2.3

changes/bug6710 | 6 ++++++ doc/tor.1.txt | 6 ++++++ src/or/circuitbuild.c | 7 +++++++ src/or/config.c | 2 ++ src/or/or.h | 4 +++- 5 files changed, 24 insertions(+), 1 deletions(-)