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

[nickm at torproject.org]

commit 689562ab481f501951c310672e09b944c2267953
Merge: b683b9a 8a060d8
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Mar 12 12:27:54 2015 -0400

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