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

[nickm at torproject.org]

commit af9bbaa8c2480679171be2e8cfb4b7b0ef38099c
Merge: e0d8ce3 4a9f689
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Apr 24 09:31:28 2017 -0400

    Merge branch 'maint-0.2.9' into release-0.2.9

 changes/bug22034 | 4 ++++
 src/or/control.c | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)