[tor-commits] [tor/maint-0.3.3] Merge remote-tracking branch 'dgoulet/bug26523_033_01' into maint-0.3.3

[nickm at torproject.org]

commit 9aeef05f8f56f16c9ff7e147ca313cc7bab88eda
Merge: 72ee0b6f7 3f8a12a63
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sun Jul 1 10:22:18 2018 -0400

    Merge remote-tracking branch 'dgoulet/bug26523_033_01' into maint-0.3.3

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