[tor-commits] [tor/maint-0.2.7] Merge branch 'maint-0.2.5' into maint-0.2.6

[nickm at torproject.org]

commit c28ba994ec95f4f669ad5131f36b0f9f1cc53782
Merge: b4bb886 9d3de77
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jul 5 12:21:25 2016 -0400

    Merge branch 'maint-0.2.5' into maint-0.2.6

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