commit e0f7a2dbd4365d453131732a668c1544962fcc0b Merge: 65a6103af 981bb6057 Author: Nick Mathewson nickm@torproject.org Date: Mon Nov 20 08:39:34 2017 -0500

Merge branch 'bug23681_029_01_squashed' into maint-0.3.2

changes/bug23681 | 5 +++++ src/or/circuituse.c | 18 ++++++++---------- 2 files changed, 13 insertions(+), 10 deletions(-)