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

[nickm at torproject.org]

commit 1fbd1e526c97347b867e8c3a0851355f65d6e7cd
Merge: e4f29dc 0f718a8
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon May 15 18:24:30 2017 -0400

    Merge branch 'maint-0.3.0' into release-0.3.0

 changes/bug22246 | 6 ++++++
 src/or/main.c    | 1 +
 2 files changed, 7 insertions(+)