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

[nickm at torproject.org]

commit 8a060d8643ff5a84cd8593f49af8221ef0855d36
Merge: 1a1d431 eecd410
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Mar 12 12:27:42 2015 -0400

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