- tor-commits - lists.torproject.org

[translation/torcheck_completed] new translations in torcheck_completed
by translation＠torproject.org 25 Nov '21

25 Nov '21

commit fed0b67e3a229f07f4d7407588770d88c85aae31 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 25 18:48:04 2021 +0000 new translations in torcheck_completed --- fr/torcheck.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/fr/torcheck.po b/fr/torcheck.po index e32305c8d9..4e3327a99f 100644 --- a/fr/torcheck.po +++ b/fr/torcheck.po @@ -3,13 +3,13 @@ # # Translators: # bassmax, 2013-2015 -# AO <ao(a)localizationlab.org>, 2018-2021 +# AO_LL <ao(a)localizationlab.org>, 2018-2021 # 4c6ce9952c5260c09c52a2847598402a_b451c51 <586e15927c43f46ef10f0dcb0660dbc3_11384>, 2012 # BitingBird <bitingbird(a)riseup.net>, 2014 # Emma Peel, 2019 # fanjoe <fanjoe(a)netcourrier.com>, 2014 -# AO <ao(a)localizationlab.org>, 2017-2018 -# AO <ao(a)localizationlab.org>, 2016 +# AO_LL <ao(a)localizationlab.org>, 2017-2018 +# AO_LL <ao(a)localizationlab.org>, 2016 # Hervé <rvdroid9(a)gmail.com>, 2015 # Maxime <maijin21(a)gmail.com>, 2013 # monsieurtino <monsieurtino(a)mailoo.org>, 2014-2015 @@ -22,7 +22,7 @@ msgstr "" "Project-Id-Version: Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" "PO-Revision-Date: 2021-07-14 18:58+0000\n" -"Last-Translator: AO <ao(a)localizationlab.org>\n" +"Last-Translator: AO_LL <ao(a)localizationlab.org>\n" "Language-Team: French (http://www.transifex.com/otf/torproject/language/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0

[translation/tor-and-https_completed] new translations in tor-and-https_completed
by translation＠torproject.org 25 Nov '21

25 Nov '21

commit 49f19755d871e9872e42187275044500d5c1ac4e Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 25 18:47:35 2021 +0000 new translations in tor-and-https_completed --- fr.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fr.po b/fr.po index dc99424414..5401c6997a 100644 --- a/fr.po +++ b/fr.po @@ -2,16 +2,16 @@ # Translators: # bassmax, 2015 # Alex <z-transifex(a)demollien.net>, 2014 -# AO <ao(a)localizationlab.org>, 2019 +# AO_LL <ao(a)localizationlab.org>, 2019 # Eva, 2015 -# AO <ao(a)localizationlab.org>, 2016 +# AO_LL <ao(a)localizationlab.org>, 2016 # Sabrina Cater <sabcat(a)gmx.fr>, 2015 msgid "" msgstr "" "Project-Id-Version: Tor Project\n" "POT-Creation-Date: 2014-07-17 14:23+0000\n" "PO-Revision-Date: 2020-06-29 14:55+0000\n" -"Last-Translator: AO <ao(a)localizationlab.org>\n" +"Last-Translator: AO_LL <ao(a)localizationlab.org>\n" "Language-Team: French (http://www.transifex.com/otf/torproject/language/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0

[translation/tails-onioncircuits_release] new translations in tails-onioncircuits_release
by translation＠torproject.org 25 Nov '21

25 Nov '21

commit d23b183214430bbcbe4f5be07c3ce06b8d573728 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 25 18:47:21 2021 +0000 new translations in tails-onioncircuits_release --- fr/onioncircuits.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/fr/onioncircuits.po b/fr/onioncircuits.po index 46466010d9..147c7605e8 100644 --- a/fr/onioncircuits.po +++ b/fr/onioncircuits.po @@ -3,9 +3,9 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# AO <ao(a)localizationlab.org>, 2018-2021 -# AO <ao(a)localizationlab.org>, 2017-2018 -# AO <ao(a)localizationlab.org>, 2016 +# AO_LL <ao(a)localizationlab.org>, 2018-2021 +# AO_LL <ao(a)localizationlab.org>, 2017-2018 +# AO_LL <ao(a)localizationlab.org>, 2016 # Gwennole Hangard <gwennole.hangard(a)gmail.com>, 2016 # syl_, 2016 # Thomas Chauchefoin <thomas(a)chauchefoin.fr>, 2016 @@ -16,7 +16,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-09-06 09:02+0200\n" "PO-Revision-Date: 2021-06-11 21:55+0000\n" -"Last-Translator: AO <ao(a)localizationlab.org>\n" +"Last-Translator: AO_LL <ao(a)localizationlab.org>\n" "Language-Team: French (http://www.transifex.com/otf/torproject/language/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0

[translation/tails-openpgp-applet_release] new translations in tails-openpgp-applet_release
by translation＠torproject.org 25 Nov '21

25 Nov '21

commit c00d9410c0da2ebc23160d959b3348cd81a1b920 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 25 18:47:11 2021 +0000 new translations in tails-openpgp-applet_release --- fr/openpgp-applet.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/fr/openpgp-applet.po b/fr/openpgp-applet.po index 8cf48d4800..913ab020e6 100644 --- a/fr/openpgp-applet.po +++ b/fr/openpgp-applet.po @@ -3,9 +3,9 @@ # This file is distributed under the same license as the OpenPGP_Applet package. # # Translators: -# AO <ao(a)localizationlab.org>, 2019-2020 -# AO <ao(a)localizationlab.org>, 2017-2018 -# AO <ao(a)localizationlab.org>, 2016 +# AO_LL <ao(a)localizationlab.org>, 2019-2020 +# AO_LL <ao(a)localizationlab.org>, 2017-2018 +# AO_LL <ao(a)localizationlab.org>, 2016 # Gwennole Hangard <gwennole.hangard(a)gmail.com>, 2015 # syl_, 2016 msgid "" @@ -14,7 +14,7 @@ msgstr "" "Report-Msgid-Bugs-To: tails(a)boum.org\n" "POT-Creation-Date: 2017-08-05 15:07-0400\n" "PO-Revision-Date: 2020-10-08 22:39+0000\n" -"Last-Translator: AO <ao(a)localizationlab.org>\n" +"Last-Translator: AO_LL <ao(a)localizationlab.org>\n" "Language-Team: French (http://www.transifex.com/otf/torproject/language/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0

[translation/tails-misc_release] new translations in tails-misc_release
by translation＠torproject.org 25 Nov '21

25 Nov '21

commit 18a28c8626303b9af5f991ae90dd0f07b8107b85 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 25 18:47:01 2021 +0000 new translations in tails-misc_release --- fr.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fr.po b/fr.po index f94599c3da..5a32540e40 100644 --- a/fr.po +++ b/fr.po @@ -6,7 +6,7 @@ # bassmax, 2014-2015 # Alex <chioubaca(a)gmail.com>, 2014 # tneskovic <antoine_ecuador(a)yahoo.fr>, 2014 -# AO <ao(a)localizationlab.org>, 2015,2018-2021 +# AO_LL <ao(a)localizationlab.org>, 2015,2018-2021 # apaddlingduck, 2014 # apaddlingduck, 2014 # Athorcis, 2015 @@ -17,7 +17,7 @@ # Emmanuel Simond <emmanuel.simond(a)gmail.com>, 2014 # Emma Peel, 2018 # Emma Peel, 2018 -# AO <ao(a)localizationlab.org>, 2017-2018 +# AO_LL <ao(a)localizationlab.org>, 2017-2018 # French language coordinator <french.translation(a)rbox.me>, 2015-2017 # Gwennole Hangard <gwennole.hangard(a)gmail.com>, 2015 # Harkium Wokea <0ye(a)protonmail.com>, 2021 @@ -36,7 +36,7 @@ # Thomas Prévost <thomasprevost85(a)gmail.com>, 2018 # tneskovic <antoine_ecuador(a)yahoo.fr>, 2014 # Towinet, 2013-2016 -# AO <ao(a)localizationlab.org>, 2015 +# AO_LL <ao(a)localizationlab.org>, 2015 # xin, 2019 # 29ecf73aa44506d57c48fc4a1ffd1a5b_54f0e73, 2019-2020 msgid ""

1 0

[translation/policies-code_of_conducttxtpot_completed] new translations in policies-code_of_conducttxtpot_completed
by translation＠torproject.org 25 Nov '21

25 Nov '21

commit 617735791741765043f527a986ca74edcce737b1 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 25 18:45:57 2021 +0000 new translations in policies-code_of_conducttxtpot_completed --- code_of_conduct+fr.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code_of_conduct+fr.po b/code_of_conduct+fr.po index aece121c29..6269712782 100644 --- a/code_of_conduct+fr.po +++ b/code_of_conduct+fr.po @@ -6,7 +6,7 @@ # # Translators: # a00fce65fdff2427915d78cd7ee0a4f6_c16c729 <a55eac686ada07eb8210deda0a39fa35_814277>, 2019 -# AO <ao(a)localizationlab.org>, 2020 +# AO_LL <ao(a)localizationlab.org>, 2020 # #, fuzzy msgid "" @@ -14,7 +14,7 @@ msgstr "" "Project-Id-Version: Code of conduct of the Tor Project\n" "POT-Creation-Date: 2019-08-02 12:00+0000\n" "PO-Revision-Date: 2019-08-27 18:54+0000\n" -"Last-Translator: AO <ao(a)localizationlab.org>, 2020\n" +"Last-Translator: AO_LL <ao(a)localizationlab.org>, 2020\n" "Language-Team: French (https://www.transifex.com/otf/teams/1519/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0

[translation/mat-gui_completed] new translations in mat-gui_completed
by translation＠torproject.org 25 Nov '21

25 Nov '21

commit 4e23f1e3509facd04de3c47363ff874dcd3f6ffe Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 25 18:45:47 2021 +0000 new translations in mat-gui_completed --- fr.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/fr.po b/fr.po index 521967bda4..5e874dab90 100644 --- a/fr.po +++ b/fr.po @@ -4,10 +4,10 @@ # # Translators: # bassmax, 2014 -# AO <ao(a)localizationlab.org>, 2019-2020 +# AO_LL <ao(a)localizationlab.org>, 2019-2020 # BitingBird <bitingbird(a)riseup.net>, 2015 -# AO <ao(a)localizationlab.org>, 2018 -# AO <ao(a)localizationlab.org>, 2016 +# AO_LL <ao(a)localizationlab.org>, 2018 +# AO_LL <ao(a)localizationlab.org>, 2016 # Gwennole Hangard <gwennole.hangard(a)gmail.com>, 2015-2016 # Onizuka, 2013 # u <u(a)451f.org>, 2014 @@ -17,7 +17,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-02-10 23:06+0100\n" "PO-Revision-Date: 2020-06-29 14:55+0000\n" -"Last-Translator: AO <ao(a)localizationlab.org>\n" +"Last-Translator: AO_LL <ao(a)localizationlab.org>\n" "Language-Team: French (http://www.transifex.com/otf/torproject/language/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0

[bridgedb/main] Update BridgeDB to use tor-geoipdb for IP-country mapping
by meskio＠torproject.org 25 Nov '21

25 Nov '21

commit 58afbd9284f07440533ecab3ec709f113c0443e3 Author: lorik55 <abhilashmhaisne(a)gmail.com> Date: Fri Nov 12 16:50:26 2021 +0530 Update BridgeDB to use tor-geoipdb for IP-country mapping Update missing copyright notice Update from Maxmind to torgeoip DB: Fixes and Improvements Update from Maxmind to torgeoip DB: Improve performance for IPv6 lookup Update from Maxmind to torgeoipdb: Add tor-geoip as requirement for CI Update install-dependencies Update install-dependencies Update install-dependencies Skip commented lines while loading geoIP DB. Update install dependencies. geo.py minor fix Update geo.py: Fix issue for out of range addresses Pycodestyle fixes and comment modifications Update geo.py to use tor-geoip DB Update geo.py to use tor-geoip DB --- bridgedb/geo.py | 102 ++++++++++++++++++++++++++++++++++++++----- scripts/install-dependencies | 2 +- 2 files changed, 91 insertions(+), 13 deletions(-) diff --git a/bridgedb/geo.py b/bridgedb/geo.py index b42ef4f..67ff374 100644 --- a/bridgedb/geo.py +++ b/bridgedb/geo.py @@ -9,8 +9,7 @@ """ Boilerplate setup for GeoIP. GeoIP allows us to look up the country code associated with an IP address. This is a "pure" python version which interacts -with the Maxmind GeoIP API (version 1). It requires, in Debian, the libgeoip-dev -and geoip-database packages. +with Tor GeoIP DB. It requires, in Debian, the tor-geoipdb package. """ import logging @@ -19,26 +18,105 @@ from os.path import isfile from ipaddr import IPv4Address, IPv6Address # IPv4 database -GEOIP_DBFILE = '/usr/share/GeoIP/GeoIP.dat' +GEOIP_DBFILE = '/usr/share/tor/geoip' # IPv6 database -GEOIPv6_DBFILE = '/usr/share/GeoIP/GeoIPv6.dat' +GEOIPv6_DBFILE = '/usr/share/tor/geoip6' + + +def loadFromGeoIPDB(filepath): + """Load entries from IPV4 or IPV6 Tor Geo IP DB Files. + + :param str filepath: Path to Tor GeoIP DB file. + :rtype: ``None`` or list + + :returns: Returns a table containing all entries from Tor Geo IP DB file. + """ + parsedTable = [] + with open(filepath) as fd: + rawData = fd.read() + + splitLines = rawData.split('\n') + for line in splitLines[:-1]: + if line.startswith('#'): + continue + singleRecord = line.split(',') + singleRecord[0] = int(singleRecord[0]) + singleRecord[1] = int(singleRecord[1]) + parsedTable.append(singleRecord) + + return parsedTable + + +def loadFromGeoIPDB6(filepath): + """Load entries from IPV4 or IPV6 Tor Geo IP DB Files. + + :param str filepath: Path to Tor GeoIP DB file. + :rtype: ``None`` or list + + :returns: Returns a table containing all entries from Tor Geo IP DB file. + """ + parsedTable = [] + with open(filepath) as fd: + rawData = fd.read() + + splitLines = rawData.split('\n') + for line in splitLines[:-1]: + if line.startswith('#'): + continue + singleRecord = line.split(',') + singleRecord[0] = int(IPv6Address(singleRecord[0])) + singleRecord[1] = int(IPv6Address(singleRecord[1])) + parsedTable.append(singleRecord) + + return parsedTable + + try: # Make sure we have the database before trying to import the module: - if not (isfile(GEOIP_DBFILE) and isfile(GEOIPv6_DBFILE)): # pragma: no cover + if not (isfile(GEOIP_DBFILE) and isfile(GEOIPv6_DBFILE)): + # pragma: no cover raise EnvironmentError("Could not find %r. On Debian-based systems, " - "please install the geoip-database package." + "please install the tor-geoipdb package." % GEOIP_DBFILE) - import pygeoip - geoip = pygeoip.GeoIP(GEOIP_DBFILE, flags=pygeoip.MEMORY_CACHE) - geoipv6 = pygeoip.GeoIP(GEOIPv6_DBFILE, flags=pygeoip.MEMORY_CACHE) + geoip = loadFromGeoIPDB(GEOIP_DBFILE) + geoipv6 = loadFromGeoIPDB6(GEOIPv6_DBFILE) logging.info("GeoIP databases loaded") except Exception as err: # pragma: no cover - logging.warn("Error while loading geoip module: %r" % err) + logging.warn("Error while loading data from GeoIP Database: %r" % err) geoip = None geoipv6 = None +def countryCodeByAddress(table, addr): + """Lookup Country Code in Geo IP tables. + + :param list table: Contains list of IP Address ranges and mapped countries + :type addr: :class:`ipaddr.IPAddress` + :param addr: An IPv4 OR IPv6 address. + :rtype: ``None`` or str + + :returns: If the GeoIP databases are loaded, and the **ip** lookup is + successful, then this returns a two-letter country code. Otherwise, + this returns ``None``. + """ + if addr.is_loopback: + return None + + addrLong = int(addr) + + # First find the range_end which is greater than input. + # Then if input lies in that range we return the country. + for item in table: + if item[1] >= addrLong: + if item[0] <= addrLong: + return item[2] + else: + return None + + return None + + def getCountryCode(ip): """Return the two-letter country code of a given IP address. @@ -64,7 +142,7 @@ def getCountryCode(ip): db = None # First, make sure we loaded GeoIP properly. if None in (geoip, geoipv6): - logging.warn("GeoIP databases aren't loaded; can't look up country code") + logging.warn("GeoIP databases not loaded; can't look up country code") return None else: if version == 4: @@ -73,7 +151,7 @@ def getCountryCode(ip): db = geoipv6 # Look up the country code of the address. - countryCode = db.country_code_by_addr(addr) + countryCode = countryCodeByAddress(db, ip) if countryCode: logging.debug("Looked up country code: %s" % countryCode) return countryCode diff --git a/scripts/install-dependencies b/scripts/install-dependencies index 4b5e435..f4a7ab0 100755 --- a/scripts/install-dependencies +++ b/scripts/install-dependencies @@ -9,7 +9,7 @@ PIP=$(which pip) PIP_FLAGS='--no-binary :all' DEPENDS="build-essential openssl sqlite3 python3-dev python3-setuptools" -DEPENDS="${DEPENDS} libgeoip-dev geoip-database libjpeg-dev" +DEPENDS="${DEPENDS} libgeoip-dev tor-geoipdb libjpeg-dev" HERE=$(dirname $0) if [ "$EUID" != "0" ] ; then SUDO=$(which sudo); fi

1 0

[bridgedb/main] Merge remote-tracking branch 'gitlab/mr/24'
by meskio＠torproject.org 25 Nov '21

25 Nov '21

commit eeca27703d5c151375ad5649263a72a44fd4481a Merge: 8a25c4f 58afbd9 Author: meskio <meskio(a)torproject.org> Date: Thu Nov 25 13:16:57 2021 +0100 Merge remote-tracking branch 'gitlab/mr/24' bridgedb/geo.py | 102 ++++++++++++++++++++++++++++++++++++++----- scripts/install-dependencies | 2 +- 2 files changed, 91 insertions(+), 13 deletions(-)

1 0

[Git][tpo/applications/android-components] Pushed new branch android-components-95.0.10-11.0-1
by boklm (＠boklm) 25 Nov '21

25 Nov '21

boklm pushed new branch android-components-95.0.10-11.0-1 at The Tor Project / Applications / android-components -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/android-components/-/tree/an… You're receiving this email because of your account on gitlab.torproject.org.

1 0