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

[nickm at torproject.org]

commit df4eba5c296caaf6a58835fe1fa113069d8631b8
Merge: d65016c0b fcd5c3144
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Oct 23 09:11:10 2017 -0400

    Merge branch 'maint-0.2.9' into release-0.2.9

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