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

[nickm at torproject.org]

commit eab67b06cf647e536c3ccaab7795b478413fa473
Merge: 0475552 3a5d4d6
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Apr 6 09:59:06 2015 -0400

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