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

[nickm at torproject.org]

commit 5c08a19eda04906cc56d6f8fa1943bc385723412
Merge: 8450f6e 64bfc29
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Mar 9 13:23:32 2015 -0400

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