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

[nickm@xxxxxxxxxxxxxx]

commit 98990452564a6c3f70bce05a299d84fb7c0024a3
Merge: 2c9ce8d 46aee42
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Sun Jan 22 18:54:25 2017 -0500

    Merge branch 'maint-0.2.9' into release-0.2.9

 changes/geoip-january2017 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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