commit 65420e4cb5edcd02b6f44462dcc5c3a7fa8bb2e9 Merge: 47b7a27 0bd53b8 Author: Nick Mathewson nickm@torproject.org Date: Wed Jan 4 13:50:24 2012 -0500

Merge remote-tracking branch 'rransom-tor/bug1297b-v2'

changes/bug1297b | 20 ++++++++++++++ changes/bug4759 | 14 +++++++++ doc/tor.1.txt | 38 +++++++++++++++++++------- src/or/circuitlist.c | 22 +++++++++------ src/or/circuitlist.h | 4 +- src/or/circuituse.c | 72 +++++++++++++++++++++++++++++++++++++++++++++++++- src/or/config.c | 2 + src/or/or.h | 33 +++++++++++++++++++++++ src/or/rendclient.c | 14 ++++++++- src/or/rendservice.c | 16 +++++++++++ 10 files changed, 211 insertions(+), 24 deletions(-)