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

[nickm at torproject.org]

commit 8b89faf424e662d09bec57c96e923773438e737e
Merge: b7dd351 ae374e0
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Apr 24 09:20:43 2017 -0400

    Merge branch 'maint-0.3.0'

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