commit 0f4f63b7b8f1546f151ce92ec64b2cfc33b8598c
Merge: d564187 e8e7a8f
Author: Nick Mathewson <nickm at torproject.org>
Date: Thu Nov 10 09:11:35 2016 -0500
Merge branch 'maint-0.2.9'
changes/bug20613 | 6 ++++++
src/or/circuituse.c | 18 +++++++++++++++++-
2 files changed, 23 insertions(+), 1 deletion(-)