commit a87c697fb157f243bc48bba868a69a5182042822 Merge: 26e7e51 5e4174f Author: Nick Mathewson <nickm@torproject.org> Date: Wed Nov 12 10:23:55 2014 -0500 Merge remote-tracking branch 'public/bug13698_024_v1' changes/bug13698 | 6 ++++++ src/or/circuitlist.c | 41 +++++++++++++++++++++++------------------ src/or/or.h | 4 ++++ src/or/rendclient.c | 5 ++--- 4 files changed, 35 insertions(+), 21 deletions(-)