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

[nickm at torproject.org]

commit 6220cd13c517f18c8a1cb1c5bc350f3e2a7eafac
Merge: e512e6c e99cc87
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jul 5 12:52:24 2016 -0400

    Merge branch 'maint-0.2.8' into release-0.2.8

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