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

[nickm at torproject.org]

commit c346c892a42558cf748c9743c5c3ef58583875ed
Merge: 4d73ed10c f2e23d38a
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Oct 31 11:43:14 2017 -0400

    Merge branch 'maint-0.3.0' into release-0.3.0

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