[tor-commits] [tor/master] Merge remote-tracking branch 'dgoulet/ticket19254_032_01'

[nickm at torproject.org]

commit 962b0b849bf0c2fcca387e334985b349a255de0a
Merge: e88fb4f4f 2be4f793e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Sep 15 11:52:10 2017 -0400

    Merge remote-tracking branch 'dgoulet/ticket19254_032_01'

 changes/feature19254 |  3 +++
 src/or/control.c     | 28 ++++++++++++++++++++++------
 2 files changed, 25 insertions(+), 6 deletions(-)