[tor-commits] [tor/release-0.2.6] Merge branch 'maint-0.2.6' into release-0.2.6

[nickm]

commit 48c4bbe9c78ade49a054305498a5e82ea25968bb
Merge: 102b2e7 f7ed4a7
Author: Nick Mathewson <ni...@torproject.org>
Date:   Wed Feb 15 07:53:08 2017 -0500

    Merge branch 'maint-0.2.6' into release-0.2.6

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