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

[nickm at torproject.org]

commit fe022f3ab0727d9f245b961c6cdc4d9c46f8c9bc
Merge: 00322a9ba eac4c374e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Oct 23 09:11:10 2017 -0400

    Merge branch 'maint-0.3.0' into release-0.3.0

 src/test/test_config.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)