[tor-commits] [tor/release-0.2.9] Merge branch 'maint-0.2.5' of git-rw.torproject.org:/tor into maint-0.2.5

[nickm@xxxxxxxxxxxxxx]

commit aeb299ba6df12aa26327ff6459174f6f9a575b0c
Merge: a452b71 144ec3d
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Wed Feb 15 07:51:33 2017 -0500

    Merge branch 'maint-0.2.5' of git-rw.torproject.org:/tor into maint-0.2.5




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