[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6
nickm at torproject.org
nickm at torproject.org
Mon Apr 27 18:18:39 UTC 2015
commit 0ac748353a6089497908fa0817ee4d4726f01158
Merge: f620b8f 6c7720e
Author: Nick Mathewson <nickm at torproject.org>
Date: Mon Apr 27 14:18:16 2015 -0400
Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6
changes/geoip-april2015 | 3 +
changes/geoip6-april2015 | 2 +
src/config/geoip |10061 ++++++++++++++++------------------------------
src/config/geoip6 | 1268 ++++--
4 files changed, 4465 insertions(+), 6869 deletions(-)
More information about the tor-commits
mailing list