[tor-commits] [tor/master] Merge branch 'ticket22684'

[nickm at torproject.org]

commit bb5968cae19d46eb4d45123146efacf0477a9d2c
Merge: 0f3084c 5dcc6be
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jun 29 10:16:15 2017 -0400

    Merge branch 'ticket22684'

 changes/ticket22684 |  5 +++++
 src/or/control.c    | 10 ++++++++++
 2 files changed, 15 insertions(+)