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

[nickm at torproject.org]

commit f9be4b96362699a77469cea954270c21c39bc171
Merge: 535e034 5446cb8
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Feb 7 09:30:31 2017 -0500

    Merge branch 'maint-0.2.6' into release-0.2.6

 changes/bug17354 | 4 ----
 src/or/main.c    | 1 -
 2 files changed, 5 deletions(-)