[tor-commits] [tor/master] Merge remote-tracking branch 'dgoulet/bug24230_032_01' into maint-0.3.2

[nickm at torproject.org]

commit 6dc784bdb3d49e10b161050212672a8f34b51865
Merge: 6059784be 42ce6f78c
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Nov 14 14:45:07 2017 -0500

    Merge remote-tracking branch 'dgoulet/bug24230_032_01' into maint-0.3.2

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