[tor-commits] [tor/release-0.3.4] Merge branch 'ticket26647_032' into maint-0.3.2

[nickm at torproject.org]

commit be3a962ca7c6fc5fd72dfd9bb1def24efa4cdf2a
Merge: 209332e71 e3e6335a0
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Jul 20 10:42:23 2018 -0400

    Merge branch 'ticket26647_032' into maint-0.3.2

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