[tor-commits] [tor/master] Merge branch 'maint-0.2.8'

[nickm at torproject.org]

commit 5c97b42cac83edfbe979f6a5399ed43c2cdad153
Merge: 8cae4ab e99cc87
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jul 5 12:52:30 2016 -0400

    Merge branch 'maint-0.2.8'

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