[tor-commits] [tor/master] Merge branch 'Ryman-bug5847-squashed'

[nickm at torproject.org]

commit f0a5416f95e06ebfd27eb95436eb85cd66494b9a
Merge: 884c0ff 0a96d11
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jun 21 12:19:55 2017 -0400

    Merge branch 'Ryman-bug5847-squashed'

 changes/bug5847  |  5 +++++
 src/or/control.c | 36 ++++++++++++++++++++++++++++--------
 2 files changed, 33 insertions(+), 8 deletions(-)