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

[nickm at torproject.org]

commit f5092e711fb08dfdf7a356f8c58f10effe6fb831
Merge: a9d4df9a0 3cace828a
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Sep 8 08:24:47 2017 -0400

    Merge branch 'maint-0.2.9' into maint-0.3.0

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