[tor-commits] [tor/master] Merge remote-tracking branch 'karsten/geoip2regcountry'

[nickm@xxxxxxxxxxxxxx]

commit 613b0a3bc5bef687f19771a8e52e57d7bd5edb5b
Merge: 23a5921 1d2179b
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Tue Feb 25 10:04:37 2014 -0500

    Merge remote-tracking branch 'karsten/geoip2regcountry'

 src/config/mmdb-convert.py |   13 +++++++++++++
 1 file changed, 13 insertions(+)

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