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

[nickm at torproject.org]

commit f54ffa463a5dd5ca41f253ce136d3e29b5e6aa20
Merge: e11cc95 f440874
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jul 5 12:23:25 2016 -0400

    Merge branch 'maint-0.2.8'

 src/or/config.c | 5 -----
 1 file changed, 5 deletions(-)