[tor-commits] [tor/release-0.2.9] Merge branch 'maint-0.2.5' into maint-0.2.9

[nickm]

commit b68e636b3368feb48444fd2f652ca279ddb73946
Merge: 4bb7d9fd1 1fa396b0a
Author: Nick Mathewson 
Date:   Thu Apr 5 08:22:33 2018 -0400

Merge branch 'maint-0.2.5' into maint-0.2.9

 changes/geoip-2018-04-03 | 4 +
 src/config/geoip | 39253 ++---
 src/config/geoip6|  5391 +++
 3 files changed, 31480 insertions(+), 13168 deletions(-)



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

[tor-commits] [tor/release-0.2.9] Merge branch 'maint-0.2.5' into maint-0.2.9

[nickm]

commit 3370b3cfef62cba8377285d95b232f810edde504
Merge: 67a313f0e 0eb2cdf99
Author: Nick Mathewson 
Date:   Mon Mar 19 05:42:43 2018 -0400

Merge branch 'maint-0.2.5' into maint-0.2.9

 .travis.yml | 24 
 1 file changed, 20 insertions(+), 4 deletions(-)




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

[tor-commits] [tor/release-0.2.9] Merge branch 'maint-0.2.5' into maint-0.2.9

[nickm]

commit 67a313f0ecc281dd73004eaa810b17e3cdcc3a24
Merge: 9eb6f9d3c 3418a3a7f
Author: Nick Mathewson 
Date:   Tue Mar 13 10:58:02 2018 -0400

Merge branch 'maint-0.2.5' into maint-0.2.9

 changes/geoip-2018-03-08 | 4 +
 src/config/geoip | 36382 -
 src/config/geoip6|   662 +-
 3 files changed, 9970 insertions(+), 27078 deletions(-)



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

[tor-commits] [tor/release-0.2.9] Merge branch 'maint-0.2.5' into maint-0.2.9

[nickm]

commit 0ddc2dc531778cfc89bad6e1c77c4eda1b8e0f71
Merge: a2aaf9509 f1278b7e5
Author: Nick Mathewson 
Date:   Thu Feb 8 10:29:05 2018 -0500

Merge branch 'maint-0.2.5' into maint-0.2.9

 changes/geoip-2018-02-07 | 4 +
 src/config/geoip | 34364 -
 src/config/geoip6|   841 +-
 3 files changed, 28369 insertions(+), 6840 deletions(-)



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

[tor-commits] [tor/release-0.2.9] Merge branch 'maint-0.2.5' into maint-0.2.9

[nickm]

commit 36567c5ca4a1f9800415c772c87ee17dfba8d75d
Merge: 9464da210 49de586ad
Author: Nick Mathewson 
Date:   Fri Jan 19 10:16:47 2018 -0500

Merge branch 'maint-0.2.5' into maint-0.2.9

 .travis.yml | 24 +---
 1 file changed, 21 insertions(+), 3 deletions(-)




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

[tor-commits] [tor/release-0.2.9] Merge branch 'maint-0.2.5' into maint-0.2.9

[nickm]

commit 26e28829da63dffe9c104e5e43d53be22bb59aeb
Merge: c52d4d9e3 8efbeb098
Author: Nick Mathewson 
Date:   Mon Jan 8 09:34:56 2018 -0500

Merge branch 'maint-0.2.5' into maint-0.2.9

 changes/geoip-2018-01-05 | 4 +
 src/config/geoip | 31441 ++---
 src/config/geoip6|   753 +-
 3 files changed, 7587 insertions(+), 24611 deletions(-)



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