commit 12c6475c064c7792004582031b8409dddfe0327f Merge: 0175209 eb15be3 Author: Nick Mathewson <nickm@torproject.org> Date: Thu Feb 7 14:31:04 2013 -0500 Merge branch 'ticket8161_squashed' changes/bug8161 | 6 ++++++ doc/tor.1.txt | 4 ++-- src/or/circuitbuild.c | 21 ++++++++++++--------- src/or/entrynodes.h | 4 ++++ 4 files changed, 24 insertions(+), 11 deletions(-)