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

[nickm at torproject.org]

commit 9bdce9d4e5fd164b05e1ae87ab0f629d2cd38e42
Merge: d8263ac 77c671b
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Mar 18 09:11:34 2015 -0400

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