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

[nickm at torproject.org]

commit 92b3fc9317c183d1566bc2361e11bafe96d003cd
Merge: 04ce541f8 a95cfb8a5
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jul 9 09:22:13 2018 -0400

    Merge branch 'maint-0.3.3' into release-0.3.3

 changes/bug25512 | 5 +++++
 src/or/control.c | 9 ++++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)