commit 0c8f901ee7c3cfd2351e7f6e723998226fabe190 Merge: 6bdfaa8b2 f9ba0c654 Author: Nick Mathewson nickm@torproject.org Date: Wed Apr 11 10:48:46 2018 -0400

Merge branch 'maint-0.3.3'

changes/bug24989 | 4 ++++ src/or/circuituse.c | 2 +- src/or/or.h | 8 ++++++++ 3 files changed, 13 insertions(+), 1 deletion(-)