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

[nickm at torproject.org]

commit 4af742fe9744b1fb81287daa920dca726771275c
Merge: ed7f248 5c08a19
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Mar 9 13:24:26 2015 -0400

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

 changes/ticket14128 |    5 +++++
 1 file changed, 5 insertions(+)