[tor-commits] [tor/master] Merge branch 'maint-0.3.0' into maint-0.3.1

[nickm at torproject.org]

commit 7a83cf75dc55dbac91ff5c0daf7c7418493cbea7
Merge: 54fb1d0f7 f5092e711
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Sep 8 08:24:47 2017 -0400

    Merge branch 'maint-0.3.0' into maint-0.3.1

 changes/bug22644 |  5 +++++
 src/or/control.c | 16 ++++++++++++----
 2 files changed, 17 insertions(+), 4 deletions(-)