March 2021 - tor-commits - lists.torproject.org

[tor/release-0.3.5] Remove maxmind license; add ipfire location database license (cc by-sa 4.0)
by nickm＠torproject.org 12 Mar '21

12 Mar '21

commit 02230575c4da6cd6342516e6682f95dad3e3e29e Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Mar 12 11:36:28 2021 -0500 Remove maxmind license; add ipfire location database license (cc by-sa 4.0) --- LICENSE | 43 ++++++++++--------------------------------- 1 file changed, 10 insertions(+), 33 deletions(-) diff --git a/LICENSE b/LICENSE index cc27668427..897f529b7b 100644 --- a/LICENSE +++ b/LICENSE @@ -186,39 +186,16 @@ getdelim.c is distributed under this license: POSSIBILITY OF SUCH DAMAGE. =============================================================================== -src/config/geoip is licensed under the following license: - -OPEN DATA LICENSE (GeoLite Country and GeoLite City databases) - -Copyright (c) 2008 MaxMind, Inc. All Rights Reserved. - -All advertising materials and documentation mentioning features or use of -this database must display the following acknowledgment: -"This product includes GeoLite data created by MaxMind, available from -http://maxmind.com/" - -Redistribution and use with or without modification, are permitted provided -that the following conditions are met: -1. Redistributions must retain the above copyright notice, this list of -conditions and the following disclaimer in the documentation and/or other -materials provided with the distribution. -2. All advertising materials and documentation mentioning features or use of -this database must display the following acknowledgement: -"This product includes GeoLite data created by MaxMind, available from -http://maxmind.com/" -3. "MaxMind" may not be used to endorse or promote products derived from this -database without specific prior written permission. - -THIS DATABASE IS PROVIDED BY MAXMIND, INC ``AS IS'' AND ANY -EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL MAXMIND BE LIABLE FOR ANY -DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -DATABASE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +src/config/geoip and src/config/geoip6: + +These files are based on the IPFire Location Database. For more +information, see https://location.ipfire.org/. + +The data is distributed under a creative commons "BY-SA 4.0" license. + +Find the full license terms at: + https://creativecommons.org/licenses/by-sa/4.0/ + =============================================================================== m4/pc_from_ucontext.m4 is available under the following license. Note that it is *not* built into the Tor software.

1 0

[tor/release-0.4.5] Merge branch 'maint-0.3.5' into maint-0.4.4
by nickm＠torproject.org 12 Mar '21

12 Mar '21

commit 9f59b6f458f2322df0bbfa48789c79f6657b4857 Merge: 41796158e6 02230575c4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Mar 12 11:36:34 2021 -0500 Merge branch 'maint-0.3.5' into maint-0.4.4 LICENSE | 43 ++++++++++--------------------------------- changes/geoip-2021-03-12 | 2 +- 2 files changed, 11 insertions(+), 34 deletions(-)

1 0

[tor/release-0.4.4] update geoip-2021-03-12 to mention provider transition.
by nickm＠torproject.org 12 Mar '21

12 Mar '21

commit aa6c7741e836b3222a3751b8128afcb1155ded2b Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Mar 12 11:29:09 2021 -0500 update geoip-2021-03-12 to mention provider transition. --- changes/geoip-2021-03-12 | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/changes/geoip-2021-03-12 b/changes/geoip-2021-03-12 index 9c0c142662..c6254de4a2 100644 --- a/changes/geoip-2021-03-12 +++ b/changes/geoip-2021-03-12 @@ -1,3 +1,9 @@ o Minor features (geoip data): - - Update the geoip files to match the IPFire Location Database, - as retrieved on 2021/03/12. + - We have switched geoip data sources. Previously we shipped + IP-to-country mappings from Maxmind's GeoLite2, but in 2019 they + changed their licensing term, so we were unable to update them after + that point. We now ship geoip files based on the IPFire Location + Database instead. (See https://location.ipfire.org/ for more + information). This release updates our geoip files to match the + IPFire Location Database as retrieved on 2021/03/12. Closes + ticket 32978.

1 0

[tor/release-0.4.4] Merge branch 'maint-0.3.5' into maint-0.4.4
by nickm＠torproject.org 12 Mar '21

12 Mar '21

commit 41796158e633524fa3222c66dbd619e32bba5c95 Merge: eb1759633a aa6c7741e8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Mar 12 11:30:21 2021 -0500 Merge branch 'maint-0.3.5' into maint-0.4.4 changes/geoip-2021-03-12 | 9 + src/config/geoip | 144354 ++++++++++++++------------------------------ src/config/geoip6 | 62679 +++++++++++++++---- 3 files changed, 95249 insertions(+), 111793 deletions(-)

1 0

[tor/release-0.4.4] Merge branch 'maint-0.4.4' into release-0.4.4
by nickm＠torproject.org 12 Mar '21

12 Mar '21

commit 877f7bbb4710ae6a67cb1ad633124109e751e7ed Merge: 34ad10db54 41796158e6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Mar 12 11:30:21 2021 -0500 Merge branch 'maint-0.4.4' into release-0.4.4 changes/geoip-2021-03-12 | 9 + src/config/geoip | 144354 ++++++++++++++------------------------------ src/config/geoip6 | 62679 +++++++++++++++---- 3 files changed, 95249 insertions(+), 111793 deletions(-)

1 0

[tor/release-0.4.5] update geoip-2021-03-12 to mention provider transition.
by nickm＠torproject.org 12 Mar '21

12 Mar '21

commit aa6c7741e836b3222a3751b8128afcb1155ded2b Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Mar 12 11:29:09 2021 -0500 update geoip-2021-03-12 to mention provider transition. --- changes/geoip-2021-03-12 | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/changes/geoip-2021-03-12 b/changes/geoip-2021-03-12 index 9c0c142662..c6254de4a2 100644 --- a/changes/geoip-2021-03-12 +++ b/changes/geoip-2021-03-12 @@ -1,3 +1,9 @@ o Minor features (geoip data): - - Update the geoip files to match the IPFire Location Database, - as retrieved on 2021/03/12. + - We have switched geoip data sources. Previously we shipped + IP-to-country mappings from Maxmind's GeoLite2, but in 2019 they + changed their licensing term, so we were unable to update them after + that point. We now ship geoip files based on the IPFire Location + Database instead. (See https://location.ipfire.org/ for more + information). This release updates our geoip files to match the + IPFire Location Database as retrieved on 2021/03/12. Closes + ticket 32978.

1 0

[tor/release-0.4.5] Merge branch 'maint-0.3.5' into maint-0.4.4
by nickm＠torproject.org 12 Mar '21

12 Mar '21

commit 41796158e633524fa3222c66dbd619e32bba5c95 Merge: eb1759633a aa6c7741e8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Mar 12 11:30:21 2021 -0500 Merge branch 'maint-0.3.5' into maint-0.4.4 changes/geoip-2021-03-12 | 9 + src/config/geoip | 144354 ++++++++++++++------------------------------ src/config/geoip6 | 62679 +++++++++++++++---- 3 files changed, 95249 insertions(+), 111793 deletions(-)

1 0

[tor/release-0.4.5] Merge branch 'maint-0.4.4' into maint-0.4.5
by nickm＠torproject.org 12 Mar '21

12 Mar '21

commit b014866f6a64ab5f2cf168bc961a899b2aafc4ec Merge: e8d224dfb1 41796158e6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Mar 12 11:30:22 2021 -0500 Merge branch 'maint-0.4.4' into maint-0.4.5 changes/geoip-2021-03-12 | 9 + src/config/geoip | 144354 ++++++++++++++------------------------------ src/config/geoip6 | 62679 +++++++++++++++---- 3 files changed, 95249 insertions(+), 111793 deletions(-)

1 0

[tor/release-0.4.5] Merge branch 'maint-0.4.5' into release-0.4.5
by nickm＠torproject.org 12 Mar '21

12 Mar '21

commit b5c565728eaf732bd6621fe582a3abe654258e47 Merge: 35cba3ae33 b014866f6a Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Mar 12 11:30:22 2021 -0500 Merge branch 'maint-0.4.5' into release-0.4.5 changes/geoip-2021-03-12 | 9 + src/config/geoip | 144354 ++++++++++++++------------------------------ src/config/geoip6 | 62679 +++++++++++++++---- 3 files changed, 95249 insertions(+), 111793 deletions(-)

1 0

[tor/release-0.3.5] update geoip-2021-03-12 to mention provider transition.
by nickm＠torproject.org 12 Mar '21

12 Mar '21

commit aa6c7741e836b3222a3751b8128afcb1155ded2b Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Mar 12 11:29:09 2021 -0500 update geoip-2021-03-12 to mention provider transition. --- changes/geoip-2021-03-12 | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/changes/geoip-2021-03-12 b/changes/geoip-2021-03-12 index 9c0c142662..c6254de4a2 100644 --- a/changes/geoip-2021-03-12 +++ b/changes/geoip-2021-03-12 @@ -1,3 +1,9 @@ o Minor features (geoip data): - - Update the geoip files to match the IPFire Location Database, - as retrieved on 2021/03/12. + - We have switched geoip data sources. Previously we shipped + IP-to-country mappings from Maxmind's GeoLite2, but in 2019 they + changed their licensing term, so we were unable to update them after + that point. We now ship geoip files based on the IPFire Location + Database instead. (See https://location.ipfire.org/ for more + information). This release updates our geoip files to match the + IPFire Location Database as retrieved on 2021/03/12. Closes + ticket 32978.

1 0