[tor-commits] [tor/release-0.2.5] Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4

[nickm@xxxxxxxxxxxxxx]

commit dbd5a9a8f99d92b38f85728edf21b9c6bfe87f38
Merge: 137982f c3f8f5a
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Fri Jan 23 08:52:20 2015 -0500

    Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4

 changes/geoip-january2015 |    3 +
 src/config/geoip          |12872 ++++++++++++++++++---------------------------
 2 files changed, 5069 insertions(+), 7806 deletions(-)



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