[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.6'

[nickm at torproject.org]

commit e3b6373003da33a0a9e9817868abbaea65bd5cec
Merge: 4af742f c066f2d
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Mar 9 13:50:05 2015 -0400

    Merge remote-tracking branch 'origin/maint-0.2.6'

 changes/ticket14128 |    5 -----
 1 file changed, 5 deletions(-)