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

[nickm at torproject.org]

commit 803fa75f7f5a8bc5b94aebfc5be81d5a05d679b4
Merge: 0172450 f440874
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jul 5 12:23:35 2016 -0400

    Merge branch 'maint-0.2.8' into release-0.2.8

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