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

[nickm]

commit ab3826f8333cec974c4b020ef30acda678ebe318
Merge: fa4a815 a5ed8b1
Author: Nick Mathewson <ni...@torproject.org>
Date:   Thu Oct 15 10:38:09 2015 -0400

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

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