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

[nickm at torproject.org]

commit cf8c3abff179b4550404bb9978a9d2b5ad18fc34
Merge: e042727cf 9aeef05f8
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sun Jul 1 10:22:21 2018 -0400

    Merge branch 'maint-0.3.3' into maint-0.3.4

 changes/bug26523 |  5 +++++
 src/or/control.c | 13 +++++++++----
 2 files changed, 14 insertions(+), 4 deletions(-)