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

[nickm at torproject.org]

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

    Merge branch 'maint-0.2.9' into release-0.2.9

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