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

[nickm@xxxxxxxxxxxxxx]

commit 1ce57267b4dbb765dc0ce652080b60ecc013703e
Merge: 9116f49 9e2608b
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Fri Oct 24 09:23:53 2014 -0400

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

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