[tor-commits] [tor/release-0.3.3] Merge branch 'maint-0.3.3' into release-0.3.3

[nickm at torproject.org]

commit 6a0b31e5a7db0271c90ef4eb11a14e16a3843d70
Merge: 3230814d2 f9ba0c654
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Apr 11 10:48:46 2018 -0400

    Merge branch 'maint-0.3.3' into release-0.3.3

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