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

[nickm at torproject.org]

commit 35a29e81aea1712caada533dbdab4248612cc185
Merge: d37e8b407 6f7d548bc
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Aug 24 09:27:26 2017 -0400

    Merge branch 'bug19281_025'

 changes/bug19281 |  5 +++++
 src/or/control.c | 20 ++++++++++++++------
 2 files changed, 19 insertions(+), 6 deletions(-)