[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2

nickm at torproject.org nickm at torproject.org
Mon Nov 14 17:52:19 UTC 2011


commit 2b7bdc295a516df457246fb69f83c8667695c59b
Merge: 8adec87 13f02c3
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Nov 14 11:10:27 2011 -0500

    Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2

 changes/geoip-november2011 |    3 +
 src/config/geoip           | 5098 ++++++++++++++++++++++++++++----------------
 2 files changed, 3302 insertions(+), 1799 deletions(-)





More information about the tor-commits mailing list