commit f5ce44e6bda4465ae31cf40860e3e0bd94ccd7e7 Merge: 60bdd2a e8e7a8f Author: Nick Mathewson nickm@torproject.org Date: Thu Nov 10 09:11:22 2016 -0500

Merge branch 'maint-0.2.9' into release-0.2.9

changes/bug20613 | 6 ++++++ src/or/circuituse.c | 18 +++++++++++++++++- 2 files changed, 23 insertions(+), 1 deletion(-)