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

[nickm at torproject.org]

commit bc6dcac353de0e30e7b47f77cd990b50af73e6ca
Merge: e732ec2 99b59de
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Mar 10 08:37:08 2015 -0400

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