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

[nickm at torproject.org]

commit ae374e0a56014b72e54adf2afb5676ae6788124c
Merge: f1613b5 4a9f689
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Apr 24 09:20:26 2017 -0400

    Merge branch 'maint-0.2.9' into maint-0.3.0

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