commit cd084c2036d19b344bae2bf4d920e6a3256fd7fb Merge: 0c7a540ba 4b41ffa64 Author: Nick Mathewson nickm@torproject.org Date: Thu Dec 7 08:42:56 2017 -0500

Merge branch 'maint-0.3.2' into release-0.3.2

changes/bug18859 | 7 +++++++ src/or/circuituse.c | 6 +++++- 2 files changed, 12 insertions(+), 1 deletion(-)