commit d4de312b3c020c031d550fcd07967283580d3c14 Merge: ecdea4e b46a7eb Author: Nick Mathewson nickm@torproject.org Date: Mon Jan 9 11:59:08 2012 -0500

Merge remote-tracking branch 'rransom-tor/bug4842'

src/or/circuitlist.c | 14 ++++++++++++++ src/or/or.h | 15 +++++++++++++++ src/or/rendservice.c | 33 +++++++++++++++++++++++++++------ 3 files changed, 56 insertions(+), 6 deletions(-)