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

[nickm at torproject.org]

commit 977821e59fb6e57639a842f498be32633bb0b0e1
Merge: 7260d07fe dbf57ecf3
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Jul 20 10:42:29 2018 -0400

    Merge branch 'maint-0.3.3' into maint-0.3.4

 changes/ticket26647 | 4 ++++
 src/or/control.c    | 4 ++++
 2 files changed, 8 insertions(+)