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

[nickm@xxxxxxxxxxxxxx]

commit 5588e677bd61b56520fd73ffcfd759e39f1d226b
Merge: 6704e18 beda8d2
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Mon Mar 9 16:23:55 2015 -0400

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

 changes/geoip-march2015 |    3 +
 src/config/geoip        |12695 ++++++++++++++++++++++++++++++++++-------------
 2 files changed, 9385 insertions(+), 3313 deletions(-)



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