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

[nickm at torproject.org]

commit ddccc0f9b4d0cfe3de516765f575e2a73cb0ec74
Merge: 03e5216 ae374e0
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Apr 24 09:31:35 2017 -0400

    Merge branch 'maint-0.3.0' into release-0.3.0

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