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

[nickm@xxxxxxxxxxxxxx]

commit 8a060d8643ff5a84cd8593f49af8221ef0855d36
Merge: 1a1d431 eecd410
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Thu Mar 12 12:27:42 2015 -0400

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

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits