date:20210219

[tor-commits] [translation/communitytpo-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot

2021-02-19 Thread translation

commit 7816de1e4f28a5f2894b743d87e90f74c569d6fd
Author: Translation commit bot 
Date:   Fri Feb 19 22:45:11 2021 +


https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot
---
 contents+es.po | 174 +++--
 1 file changed, 146 insertions(+), 28 deletions(-)

diff --git a/contents+es.po b/contents+es.po
index d9be7e3cf7..074ce7ad54 100644
--- a/contents+es.po
+++ b/contents+es.po
@@ -4,7 +4,6 @@
 # Anatoli Pena , 2019
 # vareli , 2020
 # Fred Shen , 2020
-# Zuhualime Akoochimoya, 2020
 # Gus, 2020
 # Emma Peel, 2020
 # strel, 2020
@@ -13,6 +12,7 @@
 # cacu , 2020
 # Dylan Boren , 2020
 # Burro Moro , 2021
+# Zuhualime Akoochimoya, 2021
 # 
 msgid ""
 msgstr ""
@@ -20,7 +20,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-11-05 12:55+EST\n"
 "PO-Revision-Date: 2019-12-11 10:50+\n"
-"Last-Translator: Burro Moro , 2021\n"
+"Last-Translator: Zuhualime Akoochimoya, 2021\n"
 "Language-Team: Spanish (https://www.transifex.com/otf/teams/1519/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -79,7 +79,7 @@ msgstr "Algunas ideas de proyectos para GSoC."
 
 #: https//community.torproject.org/gsoc/ (content/gsoc/contents+en.lrpage.cta)
 msgid "Get coding"
-msgstr ""
+msgstr "EmpezÃ¡ a programar"
 
 #: https//community.torproject.org/gsoc/
 #: (content/gsoc/contents+en.lrpage.body)
@@ -90,6 +90,12 @@ msgid ""
 "[contact us](mailto:gs...@torproject.org) to discuss your plans rather than "
 "sending blind applications."
 msgstr ""
+"Puede ser que algunos de estos proyectos sean buenas ideas para el Google "
+"Summer of Code. Hemos etiquetado cada una con cuÃ¡l de nuestros "
+"desarrolladores principales serÃa un buen mentor para ella. Si una o mÃ¡s de 
"
+"estas ideas te parecen prometedoras, por favor "
+"[contactanos](mailto:gs...@torproject.org) para discutir tus planes, en vez "
+"de enviar solicitudes en vano."
 
 #: https//community.torproject.org/training/
 #: (content/training/contents+en.lrpage.title)
@@ -204,7 +210,7 @@ msgstr ""
 #: https//community.torproject.org/relay/
 #: (content/relay-operations/contents+en.lrpage.title)
 msgid "Relay Operations"
-msgstr ""
+msgstr "OperaciÃ³n de Repetidores"
 
 #: https//community.torproject.org/relay/
 #: (content/relay-operations/contents+en.lrpage.subtitle)
@@ -918,6 +924,11 @@ msgid ""
 "even lead to imprisonment, physical assaults, large fines, threats, "
 "placement on government watch lists, and targeting for surveillance."
 msgstr ""
+"Sin embargo, en algunos paÃses y en ciertas circunstancias, es posible que "
+"simplemente una reunÃ³n de defensores de los derechos humanos pudiera ser "
+"riesgosa, ilegal o incluso someter a alguien a encarcelamiento, asaltos "
+"fÃsicos, grandes multas, amenazas, inclusiÃ³n en listas gubernamentales de "
+"observaciÃ³n y ser hecho objeto de vigilancia."
 
 #: https//community.torproject.org/training/risks/
 #: (content/training/risks/contents+en.lrpage.body)
@@ -955,6 +966,9 @@ msgid ""
 "surveillance, for example, might attract more attention when reaching out to"
 " other activists to run a digital security training."
 msgstr ""
+"1. **Tu modelo de amenaza.** Un activista de alto perfil que ya estÃ¡ bajo un"
+" montÃ³n de vigilancia, por ejemplo, podrÃa atraer mÃ¡s atenciÃ³n al 
contactar "
+"a otros activistas para realizar un entrenamiento en seguridad digital."
 
 #: https//community.torproject.org/training/risks/
 #: (content/training/risks/contents+en.lrpage.body)
@@ -985,6 +999,9 @@ msgid ""
 "but teaching how to circumvent government censorship could be a serious "
 "felony."
 msgstr ""
+"Por ejemplo, hablar acerca de la privacidad en la era digital pudiera ser "
+"apreciado, pero enseÃ±ar cÃ³mo evadir a la censura gubernamental podrÃa ser 
un"
+" delito serio."
 
 #: https//community.torproject.org/training/risks/
 #: (content/training/risks/contents+en.lrpage.body)
@@ -994,6 +1011,10 @@ msgid ""
 "leaked documents about government corruption, you might need to take extra "
 "care to reach out to them in a private way."
 msgstr ""
+"4. **La audiencia.** Reunir a estudiantes universitarios podrÃa no llamar la"
+" atenciÃ³n, pero si estuvieras juntando a un grupo de periodistas trabajando "
+"con documentos filtrados acerca de la corrupciÃ³n gubernamental, podrÃas "
+"necesitar ser extra cuidadoso sobre cÃ³mo contactarlos en forma privada."
 
 #: https//community.torproject.org/training/risks/
 #: (content/training/risks/contents+en.lrpage.body)
@@ -1019,6 +1040,8 @@ msgid ""
 "If the space isn't private, check before the training to find out if "
 "participants are comfortable with revealing their identity to a third party."
 msgstr ""
+"Si dicho espacio no lo es, comprobÃ¡ antes del entrenamiento si los "
+"participantes estÃ¡n cÃ³modos revelando sus identidades a un tercero."
 
 #: https//community.torproject.org/training/risks/
 #: (content/training/risks/contents+en.lrpage.b

[tor-commits] [translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal

2021-02-19 Thread translation

commit 973c46db41f2c9119b5fa680e8a12dac7857606b
Author: Translation commit bot 
Date:   Fri Feb 19 22:17:53 2021 +

https://gitweb.torproject.org/translation.git/commit/?h=support-portal
---
 contents+es.po | 337 ++---
 1 file changed, 296 insertions(+), 41 deletions(-)

diff --git a/contents+es.po b/contents+es.po
index 3d9b12572f..621bd04d85 100644
--- a/contents+es.po
+++ b/contents+es.po
@@ -9,9 +9,9 @@
 # eulalio barbero espinosa , 2020
 # Emma Peel, 2020
 # JoaquÃn Serna , 2020
-# Zuhualime Akoochimoya, 2020
 # David Figuera , 2020
 # Burro Moro , 2021
+# Zuhualime Akoochimoya, 2021
 # 
 msgid ""
 msgstr ""
@@ -19,7 +19,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-12-21 16:01+EST\n"
 "PO-Revision-Date: 2018-10-02 22:41+\n"
-"Last-Translator: Burro Moro , 2021\n"
+"Last-Translator: Zuhualime Akoochimoya, 2021\n"
 "Language-Team: Spanish (https://www.transifex.com/otf/teams/1519/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -1695,7 +1695,7 @@ msgstr "Se puede verificar esta firma con la clave 
pÃºblica."
 #: https//support.torproject.org/glossary/public-key-fingerprint/
 #: (content/glossary/public-key-fingerprint/contents+en.lrword.term)
 msgid "public key fingerprint"
-msgstr ""
+msgstr "huella digital de clave pÃºblica"
 
 #: https//support.torproject.org/glossary/public-key-fingerprint/
 #: (content/glossary/public-key-fingerprint/contents+en.lrword.definition)
@@ -1704,6 +1704,10 @@ msgid ""
 "fingerprint is a sequence of bytes that is used to identify and authenticate"
 " a corresponding longer [public key](../public-key)."
 msgstr ""
+"En [criptografÃa de clave pÃºblica](../public-key-cryptography), una huella "
+"digital de clave pÃºblica es una secuencia de bytes que es usada para "
+"identificar y autenticar una [clave pÃºblica](../public-key) "
+"correspondientemente mÃ¡s larga."
 
 #: https//support.torproject.org/glossary/relay/
 #: (content/glossary/relay/contents+en.lrword.term)
@@ -1844,7 +1848,7 @@ msgstr ""
 #: https//support.torproject.org/glossary/ssl/
 #: (content/glossary/ssl/contents+en.lrword.term)
 msgid "secure sockets layer (SSL)"
-msgstr ""
+msgstr "capa de sockets seguros (SSL)"
 
 #: https//support.torproject.org/glossary/ssl/
 #: (content/glossary/ssl/contents+en.lrword.definition)
@@ -1855,6 +1859,11 @@ msgid ""
 "transferred, preventing third parties from accessing the data as it is being"
 " sent."
 msgstr ""
+"La capa de sockets seguros (SSL) es un protocolo estÃ¡ndar de securidad de "
+"Internet que es empleado para asegurar una conexiÃ³n y proteger datos "
+"delicados que estÃ¡n siento transmitidos entre dos sistemas. SSL encripta los"
+" datos siendo transferidos, evitando que algÃºn tercero pueda accederlos a "
+"medida que son enviados."
 
 #: https//support.torproject.org/glossary/stem/
 #: (content/glossary/stem/contents+en.lrword.term)
@@ -2485,7 +2494,7 @@ msgstr "- Seguro: [OnionShare](/misc/misc-12)"
 #: https//support.torproject.org/faq/staying-anonymous/
 #: (content/faq/staying-anonymous/contents+en.lrquestion.description)
 msgid "- Unsafe: [BitTorrent over Tor](/misc/misc-4)"
-msgstr ""
+msgstr "- Inseguro: [BitTorrent sobre Tor](/misc/misc-4)"
 
 #: https//support.torproject.org/faq/staying-anonymous/
 #: (content/faq/staying-anonymous/contents+en.lrquestion.description)
@@ -3494,11 +3503,14 @@ msgid ""
 "processes](https://support.torproject.org/tbb/tbb-10) to prevent antiviruses"
 " from blocking access to Tor Browser."
 msgstr ""
+"TambiÃ©n podrÃas querer [permitir ciertos "
+"procesos](https://support.torproject.org/tbb/tbb-10) para prevenir que los "
+"antivirus bloqueen el acceso al Navegador Tor."
 
 #: https//support.torproject.org/tbb/export-and-import-bookmarks/
 #: (content/tbb/export-and-import-bookmarks/contents+en.lrquestion.title)
 msgid "How can I export and import bookmarks in Tor Browser?"
-msgstr ""
+msgstr "Â¿CÃ³mo puedo exportar e importar marcadores en el Navegador Tor?"
 
 #: https//support.torproject.org/tbb/export-and-import-bookmarks/
 #: (content/tbb/export-and-import-bookmarks/contents+en.lrquestion.description)
@@ -3506,11 +3518,15 @@ msgid ""
 "Bookmarks in the Tor Browser can be exported, imported, backed up, restored "
 "as well as imported from another browser."
 msgstr ""
+"Los marcadores en el Navegador Tor pueden ser exportados, importados, "
+"guardados como copias de seguridad y restaurados, como asÃ tambiÃ©n "
+"importados desde otro navegador."
 
 #: https//support.torproject.org/tbb/export-and-import-bookmarks/
 #: (content/tbb/export-and-import-bookmarks/contents+en.lrquestion.description)
 msgid "In order to manage your bookmarks in Tor Browser, go to:"
 msgstr ""
+"Con el fin de administrrar tus marcadores en el Navegador Tor, andÃ¡ hasta:"
 
 #: https//support.torproject.org/tbb/export-and-import-bookmarks/
 #: (content/tbb/export-and-import-bookmarks/contents+en.lrquestion.description

[tor-commits] [tor-browser-build/maint-10.0-desktop] Tag build3

2021-02-19 Thread sysrqb

commit 1dc67c192741973951c79b8440b8a586b453020c
Author: Matthew Finkel 
Date:   Fri Feb 19 22:00:33 2021 +

Tag build3
---
 rbm.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rbm.conf b/rbm.conf
index fcd8e9c..7fb27df 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -25,7 +25,7 @@ buildconf:
 
 var:
   torbrowser_version: '10.0.12'
-  torbrowser_build: 'build2'
+  torbrowser_build: 'build3'
   torbrowser_incremental_from:
 - 10.0.10
 - 10.0.11

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

[tor-commits] [tor/master] hs-v2: Warn of v2 obsolete if configured

2021-02-19 Thread dgoulet

commit 8ccfd4a51ad55e9834cffcc91cbaa13e1f19c8ff
Author: David Goulet 
Date:   Wed Feb 17 08:39:12 2021 -0500

hs-v2: Warn of v2 obsolete if configured

For a user using "HiddenServiceVersion 2", a log warning is emitted 
indicating
that v2 is now obsolete instead of a confusing message saying that the 
version
is not supported.

Also, if an introduction point gets a legacy (v2) ESTABLISH_INTRO, we'll
simply close the circuit without emitting a protocol warning log onto the
relay.

Related to #40266

Signed-off-by: David Goulet 
---
 src/feature/hs/hs_config.c | 6 ++
 src/feature/hs/hs_intropoint.c | 5 +
 2 files changed, 11 insertions(+)

diff --git a/src/feature/hs/hs_config.c b/src/feature/hs/hs_config.c
index e2e1756f21..75c417c3ef 100644
--- a/src/feature/hs/hs_config.c
+++ b/src/feature/hs/hs_config.c
@@ -436,6 +436,12 @@ config_generic_service(const hs_opts_t *hs_opts,
   /* Protocol version for the service. */
   if (hs_opts->HiddenServiceVersion == -1) {
 /* No value was set; stay with the default. */
+  } else if (hs_opts->HiddenServiceVersion == 2) {
+log_warn(LD_CONFIG, "Onion services version 2 are obsolete. Please see "
+"https://blog.torproject.org/v2-deprecation-timeline "
+"for more details and for instructions on how to "
+"transition to version 3.");
+goto err;
   } else if (CHECK_OOB(hs_opts, HiddenServiceVersion,
HS_VERSION_MIN, HS_VERSION_MAX)) {
 goto err;
diff --git a/src/feature/hs/hs_intropoint.c b/src/feature/hs/hs_intropoint.c
index 7ae6deffa2..d567201c77 100644
--- a/src/feature/hs/hs_intropoint.c
+++ b/src/feature/hs/hs_intropoint.c
@@ -512,6 +512,11 @@ hs_intro_received_establish_intro(or_circuit_t *circ, 
const uint8_t *request,
* ESTABLISH_INTRO and pass it to the appropriate cell handler */
   const uint8_t first_byte = request[0];
   switch (first_byte) {
+case TRUNNEL_HS_INTRO_AUTH_KEY_TYPE_LEGACY0:
+case TRUNNEL_HS_INTRO_AUTH_KEY_TYPE_LEGACY1:
+  /* Likely version 2 onion service which is now obsolete. Avoid a
+   * protocol warning considering they still exists on the network. */
+  goto err;
 case TRUNNEL_HS_INTRO_AUTH_KEY_TYPE_ED25519:
   return handle_establish_intro(circ, request, request_len);
 default:

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

[tor-commits] [tor/master] test: Exclude HSv2 test from Stem CI driver

2021-02-19 Thread dgoulet

commit 6e6ad44262f63938164b85377408416bab5a3da0
Author: David Goulet 
Date:   Tue Feb 16 12:53:57 2021 -0500

test: Exclude HSv2 test from Stem CI driver

Signed-off-by: David Goulet 
---
 scripts/ci/ci-driver.sh | 21 -
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/scripts/ci/ci-driver.sh b/scripts/ci/ci-driver.sh
index c07d99188b..3e47f68187 100755
--- a/scripts/ci/ci-driver.sh
+++ b/scripts/ci/ci-driver.sh
@@ -293,6 +293,7 @@ TOR_VERSION=$(grep -m 1 AC_INIT configure.ac | sed -e 
's/.*\[//; s/\].*//;')
 # Tor version.  Only create the variables we need.
 TOR_VER_AT_LEAST_043=no
 TOR_VER_AT_LEAST_044=no
+TOR_VER_AT_LEAST_046=no
 
 # These are the currently supported Tor versions; no need to work with anything
 # ancient in this script.
@@ -309,10 +310,19 @@ case "$TOR_VERSION" in
 TOR_VER_AT_LEAST_043=yes
 TOR_VER_AT_LEAST_044=no
 ;;
-*)
+0.4.4.*)
 TOR_VER_AT_LEAST_043=yes
 TOR_VER_AT_LEAST_044=yes
 ;;
+0.4.5.*)
+TOR_VER_AT_LEAST_043=yes
+TOR_VER_AT_LEAST_044=yes
+;;
+0.4.6.*)
+TOR_VER_AT_LEAST_043=yes
+TOR_VER_AT_LEAST_044=yes
+TOR_VER_AT_LEAST_046=yes
+;;
 esac
 
 #
@@ -460,12 +470,21 @@ fi
 
 if [[ "${STEM}" = "yes" ]]; then
start_section "Stem"
+   EXCLUDE_TESTS=""
+   if [[ "${TOR_VER_AT_LEAST_046}" = 'yes' ]]; then
+ EXCLUDE_TESTS="--exclude-test 
control.controller.test_ephemeral_hidden_services_v2 --exclude-test 
control.controller.test_hidden_services_conf --exclude-test 
control.controller.test_with_ephemeral_hidden_services_basic_auth 
--exclude-test control.controller.test_without_ephemeral_hidden_services 
--exclude-test 
control.controller.test_with_ephemeral_hidden_services_basic_auth_no_credentials"
+   fi
if [[ "${TOR_VER_AT_LEAST_044}" = 'yes' ]]; then
  #  This should probably be part of some test-stem make target.
+
+ # Disable the check around EXCLUDE_TESTS that requires double quote. We
+ # need it to be expanded.
+ # shellcheck disable=SC2086
  if runcmd timelimit -p -t 520 -s USR1 -T 30 -S ABRT \
python3 "${STEM_PATH}/run_tests.py" \
--tor src/app/tor \
--integ --test control.controller \
+   $EXCLUDE_TESTS \
--test control.base_controller \
--test process \
--log TRACE \



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

[tor-commits] [tor/master] man: Cleanup of v2 options and config

2021-02-19 Thread dgoulet

commit 330aec798b9a880b1f0abd65a6b7a180f7929992
Author: David Goulet 
Date:   Tue Feb 16 10:08:58 2021 -0500

man: Cleanup of v2 options and config

Signed-off-by: David Goulet 
---
 doc/man/tor.1.txt | 40 +++-
 src/app/config/config.c   |  5 +++--
 src/feature/hs/hs_options.inc |  1 -
 src/test/test_hs_config.c | 16 
 4 files changed, 6 insertions(+), 56 deletions(-)

diff --git a/doc/man/tor.1.txt b/doc/man/tor.1.txt
index 0cfda9482b..3538d94b8e 100644
--- a/doc/man/tor.1.txt
+++ b/doc/man/tor.1.txt
@@ -1241,16 +1241,6 @@ The following options are useful only for clients (that 
is, if
 **FascistFirewall** is set. This option is deprecated; use 
ReachableAddresses
 instead. (Default: 80, 443)
 
-[[HidServAuth]] **HidServAuth** __onion-address__ __auth-cookie__ 
[__service-name__]::
-Client authorization for a v2 hidden service. Valid onion addresses 
contain 16
-characters in a-z2-7 plus ".onion", and valid auth cookies contain 22
-characters in A-Za-z0-9+/. The service name is only used for internal
-purposes, e.g., for Tor controllers. This option may be used multiple times
-for different hidden services. If a hidden service uses authorization and
-this option is not set, the hidden service is not accessible. Hidden
-services can be configured to require authorization using the
-**HiddenServiceAuthorizeClient** option.
-
 [[HTTPTunnelPort]] **HTTPTunnelPort** ['address'**:**]{empty}__port__|**auto** 
[_isolation flags_]::
 Open this port to listen for proxy connections using the "HTTP CONNECT"
 protocol instead of SOCKS. Set this to
@@ -3215,20 +3205,6 @@ The next section describes the per service options that 
can only be set
not an authorization mechanism; it is instead meant to be a mild
inconvenience to port-scanners.) (Default: 0)
 
-[[HiddenServiceAuthorizeClient]] **HiddenServiceAuthorizeClient** 
__auth-type__ __client-name__,__client-name__,__...__::
-If configured, the v2 hidden service is accessible for authorized clients
-only. The auth-type can either be \'basic' for a general-purpose
-authorization protocol or \'stealth' for a less scalable protocol that also
-hides service activity from unauthorized clients. Only clients that are
-listed here are authorized to access the hidden service. Valid client names
-are 1 to 16 characters long and only use characters in A-Za-z0-9+-_ (no
-spaces). If this option is set, the hidden service is not accessible for
-clients without authorization any more. Generated authorization data can be
-found in the hostname file. Clients need to put this authorization data in
-their configuration file using **HidServAuth**. This option is only for v2
-services; v3 services configure client authentication in a subdirectory of
-HiddenServiceDir instead (see <>).
-
 [[HiddenServiceDir]] **HiddenServiceDir** __DIRECTORY__::
 Store data files for a hidden service in DIRECTORY. Every hidden service
 must have a separate directory. You may use this option  multiple times to
@@ -3323,7 +3299,7 @@ The next section describes the per service options that 
can only be set
 
 [[HiddenServiceNumIntroductionPoints]] **HiddenServiceNumIntroductionPoints** 
__NUM__::
 Number of introduction points the hidden service will have. You can't
-have more than 10 for v2 service and 20 for v3. (Default: 3)
+have more than 20. (Default: 3)
 
 [[HiddenServicePort]] **HiddenServicePort** __VIRTPORT__ [__TARGET__]::
 Configure a virtual port VIRTPORT for a hidden service. You may use this
@@ -3337,17 +3313,9 @@ The next section describes the per service options that 
can only be set
 connects to that VIRTPORT, one of the TARGETs from those lines will be
 chosen at random. Note that address-port pairs have to be comma-separated.
 
-[[HiddenServiceVersion]] **HiddenServiceVersion** **2**|**3**::
+[[HiddenServiceVersion]] **HiddenServiceVersion** **3**::
 A list of rendezvous service descriptor versions to publish for the hidden
-service. Currently, versions 2 and 3 are supported. (Default: 3)
-
-[[RendPostPeriod]] **RendPostPeriod** __N__ 
**seconds**|**minutes**|**hours**|**days**|**weeks**::
-Every time the specified period elapses, Tor uploads any rendezvous
-service descriptors to the directory servers. This information is also
-uploaded whenever it changes. Minimum value allowed is 10 minutes and
-maximum is 3.5 days. This option is only for v2 services.
-(Default: 1 hour)
-
+service. Currently, only version 3 is supported. (Default: 3)
 
 
 **PER INSTANCE OPTIONS:**
@@ -3396,8 +3364,6 @@ The next section describes the per service options that 
can only be set
 [[client-authorization]]
 == CLIENT AUTHORIZATION
 
-(Version 3 only)
-
 Service side:
 
   To configure client authorization on the service side, the
diff --git a/src/app/config/config.

[tor-commits] [tor/master] hs: Remove last artefact of HSv2 in the code

2021-02-19 Thread dgoulet

commit 8577243cd2d06a8a784fea97df00f7cc7363967f
Author: David Goulet 
Date:   Tue Feb 16 11:02:58 2021 -0500

hs: Remove last artefact of HSv2 in the code

Closes #40266

Signed-off-by: David Goulet 
---
 src/core/or/circuituse.h  |  1 -
 src/core/or/or.h  |  4 +++-
 src/feature/control/control_cmd.h |  2 --
 src/feature/hs/hs_client.c| 10 --
 src/feature/hs/hs_common.c| 21 -
 src/feature/hs/hs_common.h|  2 +-
 6 files changed, 12 insertions(+), 28 deletions(-)

diff --git a/src/core/or/circuituse.h b/src/core/or/circuituse.h
index 028fe4aa48..28e11b9859 100644
--- a/src/core/or/circuituse.h
+++ b/src/core/or/circuituse.h
@@ -76,7 +76,6 @@ bool circuit_purpose_is_hs_client(const uint8_t purpose);
 bool circuit_purpose_is_hs_service(const uint8_t purpose);
 bool circuit_purpose_is_hs_vanguards(const uint8_t purpose);
 
-bool circuit_is_hs_v2(const circuit_t *circ);
 bool circuit_is_hs_v3(const circuit_t *circ);
 
 int circuit_should_use_vanguards(uint8_t);
diff --git a/src/core/or/or.h b/src/core/or/or.h
index 294cff6603..6a15afb03a 100644
--- a/src/core/or/or.h
+++ b/src/core/or/or.h
@@ -328,7 +328,9 @@ struct curve25519_public_key_t;
  * passed through from a destroy or truncate cell. */
 #define END_CIRC_REASON_FLAG_REMOTE 512
 
-/** Length of v2 descriptor ID (32 base32 chars = 160 bits). */
+/** Length of v2 descriptor ID (32 base32 chars = 160 bits).
+ *
+ * XXX: It is still used by v3 code but should be renamed or maybe removed. */
 #define REND_DESC_ID_V2_LEN_BASE32 BASE32_DIGEST_LEN
 
 /** Maximum length of authorized client names for a hidden service. */
diff --git a/src/feature/control/control_cmd.h 
b/src/feature/control/control_cmd.h
index f21dc65edd..4aa3381d1a 100644
--- a/src/feature/control/control_cmd.h
+++ b/src/feature/control/control_cmd.h
@@ -82,8 +82,6 @@ typedef struct control_cmd_syntax_t {
  * multiple versions so this union stores the key and passes it to the HS
  * subsystem depending on the requested version. */
 typedef union add_onion_secret_key_t {
-  /* Hidden service v2 secret key. */
-  crypto_pk_t *v2;
   /* Hidden service v3 secret key. */
   ed25519_secret_key_t *v3;
 } add_onion_secret_key_t;
diff --git a/src/feature/hs/hs_client.c b/src/feature/hs/hs_client.c
index f1c17f4f90..8e15b09ba8 100644
--- a/src/feature/hs/hs_client.c
+++ b/src/feature/hs/hs_client.c
@@ -359,16 +359,6 @@ note_connection_attempt_succeeded(const 
hs_ident_edge_conn_t *hs_conn_ident)
   /* Remove from the hid serv cache all requests for that service so we can
* query the HSDir again later on for various reasons. */
   purge_hid_serv_request(&hs_conn_ident->identity_pk);
-
-  /* The v2 subsystem cleans up the intro point time out flag at this stage.
-   * We don't try to do it here because we still need to keep intact the intro
-   * point state for future connections. Even though we are able to connect to
-   * the service, doesn't mean we should reset the timed out intro points.
-   *
-   * It is not possible to have successfully connected to an intro point
-   * present in our cache that was on error or timed out. Every entry in that
-   * cache have a 2 minutes lifetime so ultimately the intro point(s) state
-   * will be reset and thus possible to be retried. */
 }
 
 /** Given the pubkey of a hidden service in onion_identity_pk, fetch its
diff --git a/src/feature/hs/hs_common.c b/src/feature/hs/hs_common.c
index ae4a9cd970..f48d956bb2 100644
--- a/src/feature/hs/hs_common.c
+++ b/src/feature/hs/hs_common.c
@@ -5,8 +5,6 @@
  * \file hs_common.c
  * \brief Contains code shared between different HS protocol version as well
  *as useful data structures and accessors used by other subsystems.
- *The rendcommon.c should only contains code relating to the v2
- *protocol.
  **/
 
 #define HS_COMMON_PRIVATE
@@ -638,7 +636,6 @@ hs_set_conn_addr_port(const smartlist_t *ports, 
edge_connection_t *conn)
   chosen_port = smartlist_choose(matching_ports);
   smartlist_free(matching_ports);
   if (chosen_port) {
-/* Remember, v2 doesn't use an hs_ident. */
 if (conn->hs_ident) {
   /* There is always a connection identifier at this point. Regardless of a
* Unix or TCP port, note the virtual port. */
@@ -1350,8 +1347,8 @@ hs_hsdir_requery_period(const or_options_t *options)
 
 /** Tracks requests for fetching hidden service descriptors. It's used by
  *  hidden service clients, to avoid querying HSDirs that have already failed
- *  giving back a descriptor. The same data structure is used to track both v2
- *  and v3 HS descriptor requests.
+ *  giving back a descriptor. The same data structure is used to track v3 HS
+ *  descriptor requests.
  *
  * The string map is a key/value store that contains the last request times to
  * hidden service directories for certain queries. Specifically:
@@ -1360,8 +1357,7 @@ hs_hsdir_requery_period(const or_options_t *options

[tor-commits] [tor/master] hs: Remove v2 stats

2021-02-19 Thread dgoulet

commit 897ec8a34cbdfc510d33cc027e13985fde8f
Author: David Goulet 
Date:   Tue Feb 16 10:36:13 2021 -0500

hs: Remove v2 stats

We still keep v2 rendezvous stats since we will allow them until the network
has entirely phased out.

Related to #40266

Signed-off-by: David Goulet 
---
 src/core/or/status.c|  3 +--
 src/feature/hs/hs_service.c |  2 +-
 src/feature/hs/hs_stats.c   | 17 ++---
 src/feature/hs/hs_stats.h   |  3 +--
 src/feature/stats/rephist.c | 37 +
 src/feature/stats/rephist.h |  6 --
 6 files changed, 6 insertions(+), 62 deletions(-)

diff --git a/src/core/or/status.c b/src/core/or/status.c
index 00a88a3178..d027bcf81a 100644
--- a/src/core/or/status.c
+++ b/src/core/or/status.c
@@ -105,10 +105,9 @@ log_onion_service_stats(void)
   }
 
   log_notice(LD_HEARTBEAT,
- "Our onion service%s received %u v2 and %u v3 INTRODUCE2 cells "
+ "Our onion service%s received %u v3 INTRODUCE2 cells "
  "and attempted to launch %d rendezvous circuits.",
  num_services == 1 ? "" : "s",
- hs_stats_get_n_introduce2_v2_cells(),
  hs_stats_get_n_introduce2_v3_cells(),
  hs_stats_get_n_rendezvous_launches());
 }
diff --git a/src/feature/hs/hs_service.c b/src/feature/hs/hs_service.c
index 79734a67d5..3e0ecb91e1 100644
--- a/src/feature/hs/hs_service.c
+++ b/src/feature/hs/hs_service.c
@@ -4075,7 +4075,7 @@ hs_service_receive_introduce2(origin_circuit_t *circ, 
const uint8_t *payload,
 
   if (circ->hs_ident) {
 ret = service_handle_introduce2(circ, payload, payload_len);
-hs_stats_note_introduce2_cell(1);
+hs_stats_note_introduce2_cell();
   }
 
  done:
diff --git a/src/feature/hs/hs_stats.c b/src/feature/hs/hs_stats.c
index f9d458d630..c292694294 100644
--- a/src/feature/hs/hs_stats.c
+++ b/src/feature/hs/hs_stats.c
@@ -12,20 +12,14 @@
 
 /** Number of v3 INTRODUCE2 cells received */
 static uint32_t n_introduce2_v3 = 0;
-/** Number of v2 INTRODUCE2 cells received */
-static uint32_t n_introduce2_v2 = 0;
 /** Number of attempts to make a circuit to a rendezvous point */
 static uint32_t n_rendezvous_launches = 0;
 
 /** Note that we received another INTRODUCE2 cell. */
 void
-hs_stats_note_introduce2_cell(int is_hsv3)
+hs_stats_note_introduce2_cell(void)
 {
-  if (is_hsv3) {
-n_introduce2_v3++;
-  } else {
-n_introduce2_v2++;
-  }
+  n_introduce2_v3++;
 }
 
 /** Return the number of v3 INTRODUCE2 cells we have received. */
@@ -35,13 +29,6 @@ hs_stats_get_n_introduce2_v3_cells(void)
   return n_introduce2_v3;
 }
 
-/** Return the number of v2 INTRODUCE2 cells we have received. */
-uint32_t
-hs_stats_get_n_introduce2_v2_cells(void)
-{
-  return n_introduce2_v2;
-}
-
 /** Note that we attempted to launch another circuit to a rendezvous point. */
 void
 hs_stats_note_service_rendezvous_launch(void)
diff --git a/src/feature/hs/hs_stats.h b/src/feature/hs/hs_stats.h
index aea2ccf5c2..b08e2f702d 100644
--- a/src/feature/hs/hs_stats.h
+++ b/src/feature/hs/hs_stats.h
@@ -9,9 +9,8 @@
 #ifndef TOR_HS_STATS_H
 #define TOR_HS_STATS_H
 
-void hs_stats_note_introduce2_cell(int is_hsv3);
+void hs_stats_note_introduce2_cell(void);
 uint32_t hs_stats_get_n_introduce2_v3_cells(void);
-uint32_t hs_stats_get_n_introduce2_v2_cells(void);
 void hs_stats_note_service_rendezvous_launch(void);
 uint32_t hs_stats_get_n_rendezvous_launches(void);
 
diff --git a/src/feature/stats/rephist.c b/src/feature/stats/rephist.c
index f8d7887e65..f7c9336bff 100644
--- a/src/feature/stats/rephist.c
+++ b/src/feature/stats/rephist.c
@@ -1722,7 +1722,6 @@ static hs_v2_stats_t *
 hs_v2_stats_new(void)
 {
   hs_v2_stats_t *new_hs_v2_stats = tor_malloc_zero(sizeof(hs_v2_stats_t));
-  new_hs_v2_stats->v2_onions_seen_this_period = digestmap_new();
 
   return new_hs_v2_stats;
 }
@@ -1737,8 +1736,6 @@ hs_v2_stats_free_(hs_v2_stats_t *victim_hs_v2_stats)
   if (!victim_hs_v2_stats) {
 return;
   }
-
-  digestmap_free(victim_hs_v2_stats->v2_onions_seen_this_period, NULL);
   tor_free(victim_hs_v2_stats);
 }
 
@@ -1753,40 +1750,9 @@ rep_hist_reset_hs_v2_stats(time_t now)
 
   hs_v2_stats->rp_v2_relay_cells_seen = 0;
 
-  digestmap_free(hs_v2_stats->v2_onions_seen_this_period, NULL);
-  hs_v2_stats->v2_onions_seen_this_period = digestmap_new();
-
   start_of_hs_v2_stats_interval = now;
 }
 
-/** As HSDirs, we saw another v2 onion with public key pubkey. Check
- *  whether we have counted it before, if not count it now! */
-void
-rep_hist_hsdir_stored_maybe_new_v2_onion(const crypto_pk_t *pubkey)
-{
-  char pubkey_hash[DIGEST_LEN];
-
-  if (!hs_v2_stats) {
-return; // We're not collecting stats
-  }
-
-  /* Get the digest of the pubkey which will be used to detect whether
- we've seen this hidden service before or not.  */
-  if (crypto_pk_get_digest(pubkey, pubkey_hash) < 0) {
-/*  This fail should not happen; key has been validated by
-descriptor p

[tor-commits] [tor/master] test: Change chutney test to use HSv3 only

2021-02-19 Thread dgoulet

commit 9f2e74cac710a50dcc08b3bcaf7c2dc91b4ea949
Author: David Goulet 
Date:   Tue Feb 16 10:19:25 2021 -0500

test: Change chutney test to use HSv3 only

Related to #40266

Signed-off-by: David Goulet 
---
 src/test/include.am | 14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/test/include.am b/src/test/include.am
index 9372b796f8..d5dcebfaea 100644
--- a/src/test/include.am
+++ b/src/test/include.am
@@ -74,22 +74,22 @@ TESTS += src/test/test-slow src/test/test-memwipe \
 
 # run a quick test or two
 # this test only uses IPv4
-TEST_CHUTNEY_FLAVOR_QUICK = bridges+hs-v23
+TEST_CHUTNEY_FLAVOR_QUICK = bridges+hs-v3
 # only run if we can ping6 ::1 (localhost)
-TEST_CHUTNEY_FLAVOR_QUICK_IPV6 = single-onion-v23-ipv6-md
+TEST_CHUTNEY_FLAVOR_QUICK_IPV6 = single-onion-v3-ipv6-md
 
 # run a basic set of tests, which only use IPv4
-TEST_CHUTNEY_FLAVORS = basic-min bridges-min hs-v23-min single-onion-v23
+TEST_CHUTNEY_FLAVORS = basic-min bridges-min hs-v3-min single-onion-v3
 
 # only run if we can ping ::1 (localhost)
-TEST_CHUTNEY_FLAVORS_IPV6 = bridges+ipv6-min ipv6-exit-min hs-v23-ipv6-md \
-   single-onion-v23-ipv6-md
+TEST_CHUTNEY_FLAVORS_IPV6 = bridges+ipv6-min ipv6-exit-min hs-v3-ipv6 \
+   single-onion-v3-ipv6-md
 
 # only run if we can find a stable (or simply another) version of tor
-TEST_CHUTNEY_FLAVORS_MIXED = mixed+hs-v23
+TEST_CHUTNEY_FLAVORS_MIXED = mixed+hs-v3
 
 # only run if IPv6 and mixed networks are run
-TEST_CHUTNEY_FLAVORS_IPV6_MIXED = mixed+hs-v23-ipv6
+TEST_CHUTNEY_FLAVORS_IPV6_MIXED = mixed+hs-v3-ipv6
 
 ### This is a lovely feature, but it requires automake >= 1.12, and Tor
 ###  doesn't require that yet.



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

[tor-commits] [tor/master] hs: Remove v2 code from HS circuitmap

2021-02-19 Thread dgoulet

commit 9782cd2c9be8e6581eaee246faa9c4ac4554b2d5
Author: David Goulet 
Date:   Tue Feb 16 10:55:56 2021 -0500

hs: Remove v2 code from HS circuitmap

Related to #40266

Signed-off-by: David Goulet 
---
 src/feature/hs/hs_circuitmap.c | 62 ++
 src/feature/hs/hs_circuitmap.h | 13 -
 src/test/test_circuitlist.c| 62 --
 3 files changed, 44 insertions(+), 93 deletions(-)

diff --git a/src/feature/hs/hs_circuitmap.c b/src/feature/hs/hs_circuitmap.c
index e46b008a5c..ee416e0d24 100644
--- a/src/feature/hs/hs_circuitmap.c
+++ b/src/feature/hs/hs_circuitmap.c
@@ -273,7 +273,7 @@ hs_circuitmap_get_or_circuit(hs_token_type_t type,
 
 / Public relay-side getters: */
 
-/** Public function: Return v2 and v3 introduction circuit to this relay.
+/** Public function: Return v3 introduction circuit to this relay.
  * Always return a newly allocated list for which it is the caller's
  * responsibility to free it. */
 smartlist_t *
@@ -286,12 +286,11 @@ hs_circuitmap_get_all_intro_circ_relay_side(void)
 circuit_t *circ = *iter;
 
 /* An origin circuit or purpose is wrong or the hs token is not set to be
- * a v2 or v3 intro relay side type, we ignore the circuit. Else, we have
+ * a v3 intro relay side type, we ignore the circuit. Else, we have
  * a match so add it to our list. */
 if (CIRCUIT_IS_ORIGIN(circ) ||
 circ->purpose != CIRCUIT_PURPOSE_INTRO_POINT ||
-(circ->hs_token->type != HS_TOKEN_INTRO_V3_RELAY_SIDE &&
- circ->hs_token->type != HS_TOKEN_INTRO_V2_RELAY_SIDE)) {
+circ->hs_token->type != HS_TOKEN_INTRO_V3_RELAY_SIDE) {
   continue;
 }
 smartlist_add(circuit_list, circ);
@@ -312,16 +311,6 @@ hs_circuitmap_get_intro_circ_v3_relay_side(
   CIRCUIT_PURPOSE_INTRO_POINT);
 }
 
-/** Public function: Return v2 introduction circuit to this relay with
- * digest. Return NULL if no such circuit is found in the circuitmap. */
-or_circuit_t *
-hs_circuitmap_get_intro_circ_v2_relay_side(const uint8_t *digest)
-{
-  return hs_circuitmap_get_or_circuit(HS_TOKEN_INTRO_V2_RELAY_SIDE,
-  REND_TOKEN_LEN, digest,
-  CIRCUIT_PURPOSE_INTRO_POINT);
-}
-
 /** Public function: Return rendezvous circuit to this relay with rendezvous
  * cookie. Return NULL if no such circuit is found in the circuitmap. */
 or_circuit_t *
@@ -344,16 +333,6 @@ hs_circuitmap_register_rend_circ_relay_side(or_circuit_t 
*circ,
  HS_TOKEN_REND_RELAY_SIDE,
  REND_TOKEN_LEN, cookie);
 }
-/** Public function: Register v2 intro circuit with key digest to the
- * circuitmap. */
-void
-hs_circuitmap_register_intro_circ_v2_relay_side(or_circuit_t *circ,
-const uint8_t *digest)
-{
-  hs_circuitmap_register_circuit(TO_CIRCUIT(circ),
- HS_TOKEN_INTRO_V2_RELAY_SIDE,
- REND_TOKEN_LEN, digest);
-}
 
 /** Public function: Register v3 intro circuit with key auth_key to the
  * circuitmap. */
@@ -393,30 +372,6 @@ hs_circuitmap_get_intro_circ_v3_service_side(const
   return circ;
 }
 
-/** Public function: Return v2 introduction circuit originating from this
- * hidden service with digest. Return NULL if no such circuit is found
- * in the circuitmap. */
-origin_circuit_t *
-hs_circuitmap_get_intro_circ_v2_service_side(const uint8_t *digest)
-{
-  origin_circuit_t *circ = NULL;
-
-  /* Check first for established intro circuits */
-  circ = hs_circuitmap_get_origin_circuit(HS_TOKEN_INTRO_V2_SERVICE_SIDE,
-  REND_TOKEN_LEN, digest,
-  CIRCUIT_PURPOSE_S_INTRO);
-  if (circ) {
-return circ;
-  }
-
-  /* ...if nothing found, check for pending intro circs */
-  circ = hs_circuitmap_get_origin_circuit(HS_TOKEN_INTRO_V2_SERVICE_SIDE,
-  REND_TOKEN_LEN, digest,
-  CIRCUIT_PURPOSE_S_ESTABLISH_INTRO);
-
-  return circ;
-}
-
 /** Public function: Return rendezvous circuit originating from this hidden
  * service with rendezvous cookie. Return NULL if no such circuit is
  * found in the circuitmap. */
@@ -515,17 +470,6 @@ hs_circuitmap_get_established_rend_circ_client_side(const 
uint8_t *cookie)
 
 / Public servide-side setters: */
 
-/** Public function: Register v2 intro circuit with key digest to the
- * circuitmap. */
-void
-hs_circuitmap_register_intro_circ_v2_service_side(origin_circuit_t *circ,
-  const uint8_t *digest)
-{
-  hs_circuitmap_register_circuit(TO_CIRCUIT(circ),
- HS_TOKEN_INTRO_V2_SERVICE_SIDE,
- REND_TOKEN_LEN, digest);
-}
-
 /** Publi

[tor-commits] [tor/master] hs: Remove introduction point v2 support

2021-02-19 Thread dgoulet

commit ca04e9b8edd1752c802b053be12594c948405d36
Author: David Goulet 
Date:   Tue Feb 16 09:27:45 2021 -0500

hs: Remove introduction point v2 support

Related to #40266

Signed-off-by: David Goulet 
---
 src/feature/hs/hs_intropoint.c |  40 +---
 src/feature/hs/hs_intropoint.h |   1 -
 src/feature/rend/rendmid.c | 205 -
 3 files changed, 5 insertions(+), 241 deletions(-)

diff --git a/src/feature/hs/hs_intropoint.c b/src/feature/hs/hs_intropoint.c
index 69d60f21c3..7ae6deffa2 100644
--- a/src/feature/hs/hs_intropoint.c
+++ b/src/feature/hs/hs_intropoint.c
@@ -494,8 +494,8 @@ hs_intro_circuit_is_suitable_for_establish_intro(const 
or_circuit_t *circ)
   return circuit_is_suitable_intro_point(circ, "ESTABLISH_INTRO");
 }
 
-/** We just received an ESTABLISH_INTRO cell in circ. Figure out of it's
- * a legacy or a next gen cell, and pass it to the appropriate handler. */
+/** We just received an ESTABLISH_INTRO cell in circ. Pass it to the
+ * appropriate handler. */
 int
 hs_intro_received_establish_intro(or_circuit_t *circ, const uint8_t *request,
 size_t request_len)
@@ -512,9 +512,6 @@ hs_intro_received_establish_intro(or_circuit_t *circ, const 
uint8_t *request,
* ESTABLISH_INTRO and pass it to the appropriate cell handler */
   const uint8_t first_byte = request[0];
   switch (first_byte) {
-case TRUNNEL_HS_INTRO_AUTH_KEY_TYPE_LEGACY0:
-case TRUNNEL_HS_INTRO_AUTH_KEY_TYPE_LEGACY1:
-  return rend_mid_establish_intro_legacy(circ, request, request_len);
 case TRUNNEL_HS_INTRO_AUTH_KEY_TYPE_ED25519:
   return handle_establish_intro(circ, request, request_len);
 default:
@@ -717,23 +714,6 @@ handle_introduce1(or_circuit_t *client_circ, const uint8_t 
*request,
   return ret;
 }
 
-/** Identify if the encoded cell we just received is a legacy one or not. The
- * request should be at least DIGEST_LEN bytes long. */
-STATIC int
-introduce1_cell_is_legacy(const uint8_t *request)
-{
-  tor_assert(request);
-
-  /* If the first 20 bytes of the cell (DIGEST_LEN) are NOT zeroes, it
-   * indicates a legacy cell (v2). */
-  if (!fast_mem_is_zero((const char *) request, DIGEST_LEN)) {
-/* Legacy cell. */
-return 1;
-  }
-  /* Not a legacy cell. */
-  return 0;
-}
-
 /** Return true iff the circuit circ is suitable for receiving an
  * INTRODUCE1 cell. */
 STATIC int
@@ -772,13 +752,10 @@ int
 hs_intro_received_introduce1(or_circuit_t *circ, const uint8_t *request,
  size_t request_len)
 {
-  int ret;
-
   tor_assert(circ);
   tor_assert(request);
 
-  /* A cell that can't hold a DIGEST_LEN is invalid as we need to check if
-   * it's a legacy cell or not using the first DIGEST_LEN bytes. */
+  /* A cell that can't hold a DIGEST_LEN is invalid. */
   if (request_len < DIGEST_LEN) {
 log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL, "Invalid INTRODUCE1 cell length.");
 goto err;
@@ -794,15 +771,8 @@ hs_intro_received_introduce1(or_circuit_t *circ, const 
uint8_t *request,
* DoS mitigation since one circuit with one client can hammer a service. */
   circ->already_received_introduce1 = 1;
 
-  /* We are sure here to have at least DIGEST_LEN bytes. */
-  if (introduce1_cell_is_legacy(request)) {
-/* Handle a legacy cell. */
-ret = rend_mid_introduce_legacy(circ, request, request_len);
-  } else {
-/* Handle a non legacy cell. */
-ret = handle_introduce1(circ, request, request_len);
-  }
-  return ret;
+  /* Handle the cell. */
+  return handle_introduce1(circ, request, request_len);
 
  err:
   circuit_mark_for_close(TO_CIRCUIT(circ), END_CIRC_REASON_TORPROTOCOL);
diff --git a/src/feature/hs/hs_intropoint.h b/src/feature/hs/hs_intropoint.h
index 8b2b9892b3..f08cef9afe 100644
--- a/src/feature/hs/hs_intropoint.h
+++ b/src/feature/hs/hs_intropoint.h
@@ -52,7 +52,6 @@ STATIC void
 get_auth_key_from_cell(ed25519_public_key_t *auth_key_out,
unsigned int cell_type, const void *cell);
 
-STATIC int introduce1_cell_is_legacy(const uint8_t *request);
 STATIC int handle_introduce1(or_circuit_t *client_circ,
  const uint8_t *request, size_t request_len);
 STATIC int validate_introduce1_parsed_cell(const trn_cell_introduce1_t *cell);
diff --git a/src/feature/rend/rendmid.c b/src/feature/rend/rendmid.c
index b497362857..fdd5202a95 100644
--- a/src/feature/rend/rendmid.c
+++ b/src/feature/rend/rendmid.c
@@ -16,217 +16,12 @@
 #include "core/or/dos.h"
 #include "core/or/relay.h"
 #include "feature/rend/rendmid.h"
-#include "feature/stats/rephist.h"
 #include "feature/hs/hs_circuitmap.h"
 #include "feature/hs/hs_dos.h"
 #include "feature/hs/hs_intropoint.h"
 
 #include "core/or/or_circuit_st.h"
 
-/** Respond to an ESTABLISH_INTRO cell by checking the signed data and
- * setting the circuit's purpose and service pk digest.
- */
-int
-rend_mid_establish_intro_legacy(or_circuit_t *circ, const uint8_t *request,
-

[tor-commits] [tor/master] or: Cleanup or.h header of HSv2 code

2021-02-19 Thread dgoulet

commit 90c1a1f8b1ec0027f6355f1bd3cd8a369dc4cffc
Author: David Goulet 
Date:   Tue Feb 16 09:36:51 2021 -0500

or: Cleanup or.h header of HSv2 code

Signed-off-by: David Goulet 
---
 src/core/or/or.h | 83 +---
 src/feature/control/control_events.c |  6 ---
 2 files changed, 2 insertions(+), 87 deletions(-)

diff --git a/src/core/or/or.h b/src/core/or/or.h
index 5bade00128..294cff6603 100644
--- a/src/core/or/or.h
+++ b/src/core/or/or.h
@@ -328,70 +328,9 @@ struct curve25519_public_key_t;
  * passed through from a destroy or truncate cell. */
 #define END_CIRC_REASON_FLAG_REMOTE 512
 
-/** Length of 'y' portion of 'y.onion' URL. */
-#define REND_SERVICE_ID_LEN_BASE32 16
-
-/** Length of 'y.onion' including '.onion' URL. */
-#define REND_SERVICE_ADDRESS_LEN (16+1+5)
-
-/** Length of a binary-encoded rendezvous service ID. */
-#define REND_SERVICE_ID_LEN 10
-
-/** Time period for which a v2 descriptor will be valid. */
-#define REND_TIME_PERIOD_V2_DESC_VALIDITY (24*60*60)
-
-/** Time period within which two sets of v2 descriptors will be uploaded in
- * parallel. */
-#define REND_TIME_PERIOD_OVERLAPPING_V2_DESCS (60*60)
-
-/** Number of non-consecutive replicas (i.e. distributed somewhere
- * in the ring) for a descriptor. */
-#define REND_NUMBER_OF_NON_CONSECUTIVE_REPLICAS 2
-
-/** Number of consecutive replicas for a descriptor. */
-#define REND_NUMBER_OF_CONSECUTIVE_REPLICAS 3
-
 /** Length of v2 descriptor ID (32 base32 chars = 160 bits). */
 #define REND_DESC_ID_V2_LEN_BASE32 BASE32_DIGEST_LEN
 
-/** Length of the base32-encoded secret ID part of versioned hidden service
- * descriptors. */
-#define REND_SECRET_ID_PART_LEN_BASE32 BASE32_DIGEST_LEN
-
-/** Length of the base32-encoded hash of an introduction point's
- * identity key. */
-#define REND_INTRO_POINT_ID_LEN_BASE32 BASE32_DIGEST_LEN
-
-/** Length of the descriptor cookie that is used for client authorization
- * to hidden services. */
-#define REND_DESC_COOKIE_LEN 16
-
-/** Length of the base64-encoded descriptor cookie that is used for
- * exchanging client authorization between hidden service and client. */
-#define REND_DESC_COOKIE_LEN_BASE64 22
-
-/** Length of client identifier in encrypted introduction points for hidden
- * service authorization type 'basic'. */
-#define REND_BASIC_AUTH_CLIENT_ID_LEN 4
-
-/** Multiple of the number of clients to which the real number of clients
- * is padded with fake clients for hidden service authorization type
- * 'basic'. */
-#define REND_BASIC_AUTH_CLIENT_MULTIPLE 16
-
-/** Length of client entry consisting of client identifier and encrypted
- * session key for hidden service authorization type 'basic'. */
-#define REND_BASIC_AUTH_CLIENT_ENTRY_LEN (REND_BASIC_AUTH_CLIENT_ID_LEN \
-  + CIPHER_KEY_LEN)
-
-/** Maximum size of v2 hidden service descriptors. */
-#define REND_DESC_MAX_SIZE (20 * 1024)
-
-/** Legal characters for use in authorized client names for a hidden
- * service. */
-#define REND_LEGAL_CLIENTNAME_CHARACTERS \
-  "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789+-_"
-
 /** Maximum length of authorized client names for a hidden service. */
 #define REND_CLIENTNAME_MAX_LEN 16
 
@@ -402,19 +341,10 @@ struct curve25519_public_key_t;
 /** Client authorization type that a hidden service performs. */
 typedef enum rend_auth_type_t {
   REND_NO_AUTH  = 0,
-  REND_BASIC_AUTH   = 1,
-  REND_STEALTH_AUTH = 2,
-  REND_V3_AUTH  = 3, /* Dummy flag to allow adding v3 services on the
+  REND_V3_AUTH  = 1, /* Dummy flag to allow adding v3 services on the
   * control port */
 } rend_auth_type_t;
 
-/** Client-side configuration of authorization for a hidden service. */
-typedef struct rend_service_authorization_t {
-  uint8_t descriptor_cookie[REND_DESC_COOKIE_LEN];
-  char onion_address[REND_SERVICE_ADDRESS_LEN+1];
-  rend_auth_type_t auth_type;
-} rend_service_authorization_t;
-
 /* Stub because we can't include hs_ident.h. */
 struct hs_ident_edge_conn_t;
 struct hs_ident_dir_conn_t;
@@ -1013,15 +943,9 @@ typedef struct vote_timing_t vote_timing_t;
 
 typedef struct microdesc_cache_t microdesc_cache_t;
 
-/* rendcommon.c ***/
-
-typedef struct rend_authorized_client_t rend_authorized_client_t;
-typedef struct rend_encoded_v2_service_descriptor_t
-   rend_encoded_v2_service_descriptor_t;
-
 /** The maximum number of non-circuit-build-timeout failures a hidden
  * service client will tolerate while trying to build a circuit to an
- * introduction point.  See also rend_intro_point_t.unreachable_count. */
+ * introduction point. */
 #define MAX_INTRO_POINT_REACHABILITY_FAILURES 5
 
 /** The minimum and maximum number of distinct INTRODUCE2 cells which a
@@ -1050,9 +974,6 @@ typedef struct rend_encoded_v2_service_descriptor_t
  * lifetime so this is a hard limit on the amount of time

[tor-commits] [tor/master] hs-v2: Remove client support

2021-02-19 Thread dgoulet

commit 2444629c86e3368ebd6c9ee1b54aa5a5959fa398
Author: David Goulet 
Date:   Fri Feb 5 10:39:55 2021 -0500

hs-v2: Remove client support

Related to #40266

Signed-off-by: David Goulet 
---
 src/app/config/config.c   |3 +-
 src/app/config/or_options_st.h|3 -
 src/app/main/shutdown.c   |2 -
 src/core/mainloop/connection.c|1 -
 src/core/or/circuitlist.c |2 +-
 src/core/or/circuitstats.c|1 -
 src/core/or/circuituse.c  |7 +-
 src/core/or/connection_edge.c |   82 +-
 src/core/or/connection_edge.h |1 -
 src/core/or/crypt_path.c  |4 -
 src/feature/control/control_cmd.c |5 +-
 src/feature/control/control_getinfo.c |   30 +-
 src/feature/dirclient/dirclient.c |   13 -
 src/feature/dircommon/directory.c |1 -
 src/feature/hs/hs_circuit.c   |5 +-
 src/feature/hs/hs_client.c|   32 +-
 src/feature/hs/hs_common.c|5 +-
 src/feature/hs/hs_config.c|6 -
 src/feature/rend/include.am   |2 -
 src/feature/rend/rendclient.c | 1322 -
 src/feature/rend/rendclient.h |   54 --
 src/feature/rend/rendcommon.c |2 +-
 src/feature/rend/rendservice.c|1 -
 src/test/test_config.c|1 -
 src/test/test_entryconn.c |   41 -
 src/test/test_hs_common.c |   15 -
 src/test/test_options.c   |8 -
 27 files changed, 26 insertions(+), 1623 deletions(-)

diff --git a/src/app/config/config.c b/src/app/config/config.c
index 1e4d18116c..dec4890e70 100644
--- a/src/app/config/config.c
+++ b/src/app/config/config.c
@@ -103,7 +103,7 @@
 #include "feature/relay/routermode.h"
 #include "feature/relay/relay_config.h"
 #include "feature/relay/transport_config.h"
-#include "feature/rend/rendclient.h"
+#include "feature/rend/rendcommon.h"
 #include "feature/rend/rendservice.h"
 #include "lib/geoip/geoip.h"
 #include "feature/stats/geoip_stats.h"
@@ -504,7 +504,6 @@ static const config_var_t option_vars_[] = {
   VAR("HiddenServiceOnionBalanceInstance",
   LINELIST_S, RendConfigLines, NULL),
   VAR("HiddenServiceStatistics", BOOL, HiddenServiceStatistics_option, "1"),
-  V(HidServAuth, LINELIST, NULL),
   V(ClientOnionAuthDir,  FILENAME, NULL),
   OBSOLETE("CloseHSClientCircuitsImmediatelyOnTimeout"),
   OBSOLETE("CloseHSServiceRendCircuitsImmediatelyOnTimeout"),
diff --git a/src/app/config/or_options_st.h b/src/app/config/or_options_st.h
index 714034b28d..f9c6dae2b6 100644
--- a/src/app/config/or_options_st.h
+++ b/src/app/config/or_options_st.h
@@ -428,9 +428,6 @@ struct or_options_t {
   int NumCPUs; /**< How many CPUs should we try to use? */
   struct config_line_t *RendConfigLines; /**< List of configuration lines
   * for rendezvous services. */
-  struct config_line_t *HidServAuth; /**< List of configuration lines for
-   * client-side authorizations for hidden
-   * services */
   char *ClientOnionAuthDir; /**< Directory to keep client
  * onion service authorization secret keys */
   char *ContactInfo; /**< Contact info to be published in the directory. */
diff --git a/src/app/main/shutdown.c b/src/app/main/shutdown.c
index 4a556333db..fe80a92991 100644
--- a/src/app/main/shutdown.c
+++ b/src/app/main/shutdown.c
@@ -46,7 +46,6 @@
 #include "feature/relay/ext_orport.h"
 #include "feature/relay/relay_config.h"
 #include "feature/rend/rendcache.h"
-#include "feature/rend/rendclient.h"
 #include "feature/stats/bwhist.h"
 #include "feature/stats/geoip_stats.h"
 #include "feature/stats/rephist.h"
@@ -120,7 +119,6 @@ tor_free_all(int postfork)
   addressmap_free_all();
   dirserv_free_all();
   rend_cache_free_all();
-  rend_service_authorization_free_all();
   rep_hist_free_all();
   bwhist_free_all();
   circuit_free_all();
diff --git a/src/core/mainloop/connection.c b/src/core/mainloop/connection.c
index f90872ec22..376994f1c1 100644
--- a/src/core/mainloop/connection.c
+++ b/src/core/mainloop/connection.c
@@ -106,7 +106,6 @@
 #include "feature/relay/dns.h"
 #include "feature/relay/ext_orport.h"
 #include "feature/relay/routermode.h"
-#include "feature/rend/rendclient.h"
 #include "feature/rend/rendcommon.h"
 #include "feature/stats/connstats.h"
 #include "feature/stats/rephist.h"
diff --git a/src/core/or/circuitlist.c b/src/core/or/circuitlist.c
index bd36683880..f6d9fcf534 100644
--- a/src/core/or/circuitlist.c
+++ b/src/core/or/circuitlist.c
@@ -88,7 +88,7 @@
 #include "core/or/policies.h"
 #include "core/or/relay.h"
 #include "core/crypto/relay_crypto.h"
-#include "feature/rend/rendclient.h"
+#include "feature/rend/rendcache.h"
 #include "feature/rend/rendcommon.h"
 #include "feature/stats/predict_ports.h"
 #include "feature/stats/bwhi

[tor-commits] [tor/master] hs: Rename service config port object

2021-02-19 Thread dgoulet

commit a34885bc8035eb29524749582c16ce4ec8fbc715
Author: David Goulet 
Date:   Fri Feb 5 10:58:19 2021 -0500

hs: Rename service config port object

Remove it from rendservice.c and move everything related to hs_common.{c|h}.

Related to #40266

Signed-off-by: David Goulet 
---
 src/feature/control/control_cmd.c |   7 +-
 src/feature/hs/hs_common.c| 149 --
 src/feature/hs/hs_common.h|   9 ++-
 src/feature/hs/hs_config.c|   4 +-
 src/feature/hs/hs_metrics.c   |   2 +-
 src/feature/hs/hs_service.c   |   4 +-
 src/feature/hs/hs_service.h   |   2 +-
 src/feature/rend/rendservice.c| 138 +--
 src/feature/rend/rendservice.h|  10 +--
 src/test/test_controller.c|  46 ++--
 src/test/test_hs.c|   6 +-
 11 files changed, 186 insertions(+), 191 deletions(-)

diff --git a/src/feature/control/control_cmd.c 
b/src/feature/control/control_cmd.c
index 737a5927e9..e88f17de09 100644
--- a/src/feature/control/control_cmd.c
+++ b/src/feature/control/control_cmd.c
@@ -1727,8 +1727,7 @@ handle_control_add_onion(control_connection_t *conn,
   for (arg = args->kwargs; arg; arg = arg->next) {
 if (!strcasecmp(arg->key, "Port")) {
   /* "Port=VIRTPORT[,TARGET]". */
-  rend_service_port_config_t *cfg =
-  rend_service_parse_port_config(arg->value, ",", NULL);
+  hs_port_config_t *cfg = hs_parse_port_config(arg->value, ",", NULL);
   if (!cfg) {
 control_write_endreply(conn, 512, "Invalid VIRTPORT/TARGET");
 goto out;
@@ -1987,8 +1986,8 @@ handle_control_add_onion(control_connection_t *conn,
 
  out:
   if (port_cfgs) {
-SMARTLIST_FOREACH(port_cfgs, rend_service_port_config_t*, p,
-  rend_service_port_config_free(p));
+SMARTLIST_FOREACH(port_cfgs, hs_port_config_t*, p,
+  hs_port_config_free(p));
 smartlist_free(port_cfgs);
   }
 
diff --git a/src/feature/hs/hs_common.c b/src/feature/hs/hs_common.c
index 91cb6d529b..55cc4d5518 100644
--- a/src/feature/hs/hs_common.c
+++ b/src/feature/hs/hs_common.c
@@ -37,6 +37,7 @@
 #include "feature/relay/routermode.h"
 #include "lib/crypt_ops/crypto_rand.h"
 #include "lib/crypt_ops/crypto_util.h"
+#include "lib/net/resolve.h"
 
 #include "core/or/edge_connection_st.h"
 #include "feature/nodelist/networkstatus_st.h"
@@ -57,12 +58,12 @@ static const char *str_ed25519_basepoint =
 
 #ifdef HAVE_SYS_UN_H
 
-/** Given ports, a smarlist containing rend_service_port_config_t,
+/** Given ports, a smarlist containing hs_port_config_t,
  * add the given p, a AF_UNIX port to the list. Return 0 on success
  * else return -ENOSYS if AF_UNIX is not supported (see function in the
  * #else statement below). */
 static int
-add_unix_port(smartlist_t *ports, rend_service_port_config_t *p)
+add_unix_port(smartlist_t *ports, hs_port_config_t *p)
 {
   tor_assert(ports);
   tor_assert(p);
@@ -76,7 +77,7 @@ add_unix_port(smartlist_t *ports, rend_service_port_config_t 
*p)
  * on success else return -ENOSYS if AF_UNIX is not supported (see function
  * in the #else statement below). */
 static int
-set_unix_port(edge_connection_t *conn, rend_service_port_config_t *p)
+set_unix_port(edge_connection_t *conn, hs_port_config_t *p)
 {
   tor_assert(conn);
   tor_assert(p);
@@ -92,7 +93,7 @@ set_unix_port(edge_connection_t *conn, 
rend_service_port_config_t *p)
 #else /* !defined(HAVE_SYS_UN_H) */
 
 static int
-set_unix_port(edge_connection_t *conn, rend_service_port_config_t *p)
+set_unix_port(edge_connection_t *conn, hs_port_config_t *p)
 {
   (void) conn;
   (void) p;
@@ -100,7 +101,7 @@ set_unix_port(edge_connection_t *conn, 
rend_service_port_config_t *p)
 }
 
 static int
-add_unix_port(smartlist_t *ports, rend_service_port_config_t *p)
+add_unix_port(smartlist_t *ports, hs_port_config_t *p)
 {
   (void) ports;
   (void) p;
@@ -859,7 +860,7 @@ hs_get_subcredential(const ed25519_public_key_t 
*identity_pk,
 int
 hs_set_conn_addr_port(const smartlist_t *ports, edge_connection_t *conn)
 {
-  rend_service_port_config_t *chosen_port;
+  hs_port_config_t *chosen_port;
   unsigned int warn_once = 0;
   smartlist_t *matching_ports;
 
@@ -867,7 +868,7 @@ hs_set_conn_addr_port(const smartlist_t *ports, 
edge_connection_t *conn)
   tor_assert(conn);
 
   matching_ports = smartlist_new();
-  SMARTLIST_FOREACH_BEGIN(ports, rend_service_port_config_t *, p) {
+  SMARTLIST_FOREACH_BEGIN(ports, hs_port_config_t *, p) {
 if (TO_CONN(conn)->port != p->virtual_port) {
   continue;
 }
@@ -912,6 +913,138 @@ hs_set_conn_addr_port(const smartlist_t *ports, 
edge_connection_t *conn)
   return (chosen_port) ? 0 : -1;
 }
 
+/** Return a new hs_port_config_t with its path set to
+ * socket_path or empty if socket_path is NULL */
+static hs_port_config_t *
+hs_port_config_new(const char *socket_path)
+{
+  if (!socket_path)
+return tor_malloc_zero(sizeof(hs_port_config_t)

[tor-commits] [translation/tails-misc_release] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release

2021-02-19 Thread translation

commit 36877312337b44d34ff7b1649cadc84aceb4df26
Author: Translation commit bot 
Date:   Fri Feb 19 20:46:27 2021 +

https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release
---
 cs.po | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/cs.po b/cs.po
index f98d5c3da2..a6690d26de 100644
--- a/cs.po
+++ b/cs.po
@@ -8,6 +8,7 @@
 # David Nowak , 2020
 # Filip Hruska , 2014
 # Fourdee Foureight, 2020
+# Jan Pechacek , 2021
 # Pivoj, 2015
 # JiÅÃ VÃrava , 2013-2014
 # trendspotter, 2019
@@ -25,8 +26,8 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-01-05 11:44+0100\n"
-"PO-Revision-Date: 2021-01-05 12:15+\n"
-"Last-Translator: Transifex Bot <>\n"
+"PO-Revision-Date: 2021-02-19 20:33+\n"
+"Last-Translator: Jan Pechacek \n"
 "Language-Team: Czech (http://www.transifex.com/otf/torproject/language/cs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"

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

[tor-commits] [translation/tails-misc] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc

2021-02-19 Thread translation

commit 0c7fe16a46a28fa2150c38cc40e4763d859ecd99
Author: Translation commit bot 
Date:   Fri Feb 19 20:45:48 2021 +

https://gitweb.torproject.org/translation.git/commit/?h=tails-misc
---
 cs.po | 33 +
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/cs.po b/cs.po
index 6c72b74485..9787b09f87 100644
--- a/cs.po
+++ b/cs.po
@@ -7,7 +7,8 @@
 # Adam Slovacek , 2013
 # David Nowak , 2020
 # Filip Hruska , 2014
-# Fourdee Foureight , 2020
+# Fourdee Foureight, 2020
+# Jan Pechacek , 2021
 # Pivoj, 2015
 # JiÅÃ VÃrava , 2013-2014
 # trendspotter, 2019
@@ -25,8 +26,8 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-01-05 11:44+0100\n"
-"PO-Revision-Date: 2021-01-05 12:15+\n"
-"Last-Translator: Transifex Bot <>\n"
+"PO-Revision-Date: 2021-02-19 20:33+\n"
+"Last-Translator: Jan Pechacek \n"
 "Language-Team: Czech (http://www.transifex.com/otf/torproject/language/cs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -241,7 +242,7 @@ msgid ""
 "It is not possible to automatically upgrade your device to this new version: 
{explanation}.\n"
 "\n"
 "To learn how to do a manual upgrade, go to {manual_upgrade_url}"
-msgstr ""
+msgstr "MÄli byste provÃ©st ruÄnÃ aktualizaci na 
{name}{version}.\n\nVÃce informacÃ o tÃ©to novÃ© verzi naleznete na 
{details_url}\n\nNenÃ moÅ¾nÃ© automaticky aktualizovat vaÅ¡e zaÅÃzenÃ na 
tuto novou verzi: {explanation}.\n\nChcete-li zjistit, jak provÃ©st ruÄnÃ 
aktualizaci, podÃvejte se na  {manual_upgrade_url}"
 
 #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:471
 msgid "New version available"
@@ -302,7 +303,7 @@ msgid ""
 "The network connection will be disabled when applying the upgrade.\n"
 "\n"
 "Please save your work and close all other applications."
-msgstr ""
+msgstr "Aktualizace byla ÃºspÄÅ¡nÄ staÅ¾ena.\n\nSÃÅ¥ovÃ© pÅipojenÃ bude 
bÄhem provÃ¡dÄnÃ aktualizace vypnuto.\n\nUloÅ¾te prosÃm svou prÃ¡ci a 
ukonÄete vÅ¡echny ostatnÃ aplikace."
 
 #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:700
 msgid "Upgrade successfully downloaded"
@@ -367,7 +368,7 @@ msgid ""
 "Your Tails device is being upgraded...\n"
 "\n"
 "For security reasons, the network connection is now disabled."
-msgstr ""
+msgstr "VaÅ¡e zaÅÃzenÃ Tails se prÃ¡vÄ aktualizuje...\n\nZ dÅ¯vodu 
bezpeÄnosti je nynÃ sÃÅ¥ovÃ© pÅipojenÃ vypnuto."
 
 #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:796
 msgid ""
@@ -537,7 +538,7 @@ msgstr "ZapsÃ¡no na zaÅÃzenÃ rychlostÃ %(speed)d MB/s"
 msgid ""
 "There was a problem executing the following command: `%(command)s`.\n"
 "A more detailed error log has been written to \"%(filename)s\"."
-msgstr ""
+msgstr "Vyskytl se problÃ©m pÅi provÃ¡dÄnÃ nÃ¡sledujÃcÃho pÅÃkazu: 
`%(command)s`.\nPodrobnÄjÅ¡Ã zÃ¡znam o chybÄ byl zapsÃ¡n do 
\"%(filename)s\"."
 
 #: 
config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/creator.py:424
 #, python-format
@@ -608,17 +609,17 @@ msgstr "Nenalezeny Å¾Ã¡dnÃ© body pÅipojenÃ"
 #: 
config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/creator.py:661
 #, python-format
 msgid "Entering unmount_device for \"%(device)s\""
-msgstr ""
+msgstr "ProvÃ¡dÃm unmount_device pro \"%(device)s\""
 
 #: 
config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/creator.py:670
 #, python-format
 msgid "Unmounting mounted filesystems on \"%(device)s\""
-msgstr ""
+msgstr "Odpojuji pÅipojenÃ© systÃ©my souborÅ¯ na \"%(device)s\""
 
 #: 
config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/creator.py:674
 #, python-format
 msgid "Unmounting \"%(udi)s\" on \"%(device)s\""
-msgstr ""
+msgstr "Odpojuji \"%(udi)s\" na \"%(device)s\""
 
 #: 
config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/creator.py:685
 #, python-format
@@ -788,7 +789,7 @@ msgstr "ZaÅÃzenÃ \"%(pretty_name)s\" je moc malÃ© pro 
instalaci Tails (je vy
 msgid ""
 "To upgrade device \"%(pretty_name)s\" from this Tails, you need to use a 
downloaded Tails ISO image:\n"
 "%(dl_url)s"
-msgstr ""
+msgstr "Pro aktualizaci zaÅÃzenÃ \"%(pretty_name)s\" z tÃ©to verze Tails 
budete muset pouÅ¾Ãt staÅ¾enÃ½ ISO obraz Tails:\n%(dl_url)s"
 
 #: 
config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/gui.py:513
 msgid "An error happened while installing Tails"
@@ -869,17 +870,17 @@ msgstr "Nastal problÃ©m pÅi spouÅ¡tÄnÃ 
'%(cmd)s'.\n%(out)s\n%(err)s"
 #: 
config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/source.py:64
 #, python-format
 msgid "\"%s\" does not exist"
-msgstr ""
+msgstr "\"%s\" neexistuje"
 
 #: 
config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/source.py:66
 #, python-format
 msgid "\"%s\" is not a directory"
-msgstr ""
+msgstr "\"%s\" nenÃ adresÃ¡Å"
 
 #: 
config/chroot_local-in

[tor-commits] [translation/https_everywhere] https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere

2021-02-19 Thread translation

commit df33d1e7eb2fdb145b7e7c2e3f7449ee7b4b936b
Author: Translation commit bot 
Date:   Fri Feb 19 20:45:21 2021 +

https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere
---
 cs/https-everywhere.dtd | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/cs/https-everywhere.dtd b/cs/https-everywhere.dtd
index c092e0ecb6..3782dcc11f 100644
--- a/cs/https-everywhere.dtd
+++ b/cs/https-everywhere.dtd
@@ -49,8 +49,8 @@
 
 
 
-
-
+
+
 
 
 
@@ -63,8 +63,8 @@
 
 
 
-
-
+
+
 
 
 

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

[tor-commits] [translation/tails-misc_release] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release

2021-02-19 Thread translation

commit adebde9fc79b4fd839827715c8d0305c719e7772
Author: Translation commit bot 
Date:   Fri Feb 19 19:16:36 2021 +

https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release
---
 hu.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hu.po b/hu.po
index 6102e47858..bff2e4c506 100644
--- a/hu.po
+++ b/hu.po
@@ -9,7 +9,7 @@
 # Blackywantscookies, 2014
 # Blackywantscookies, 2014
 # 774f2855e7016a193f9916f715f8a14e_4f42736 
, 2013
-# Kovacs Zeteny , 2021
+# 2bf2a1b19224666a9fd46a721e1498fd_cf6ff7b 
<06435adb4e599f62423b0c8619c8eba7_967332>, 2021
 # Lajos Pasztor , 2014
 # Robert Zsolt , 2016
 # vargaviktor , 2013,2015,2018-2020
@@ -19,7 +19,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-01-05 11:44+0100\n"
 "PO-Revision-Date: 2021-02-15 22:55+\n"
-"Last-Translator: Kovacs Zeteny \n"
+"Last-Translator: 2bf2a1b19224666a9fd46a721e1498fd_cf6ff7b 
<06435adb4e599f62423b0c8619c8eba7_967332>\n"
 "Language-Team: Hungarian 
(http://www.transifex.com/otf/torproject/language/hu/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"

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

[tor-commits] [tor-browser-build/maint-10.0-desktop] Bug 40239: Don't download mar tools from old versions

2021-02-19 Thread sysrqb

commit 35227374db93e0b7d1e5a1f09afd1db4289e7c00
Author: Nicolas Vigier 
Date:   Fri Feb 19 17:04:43 2021 +0100

Bug 40239: Don't download mar tools from old versions

Before generating incremental mar files, we download mar files and
mar-tools-linux64.zip from the previous version. However we use
mar-tools from the new version and don't use the one from the old
version, so there is no need to download it.
---
 tools/update-responses/update_responses | 15 ---
 1 file changed, 15 deletions(-)

diff --git a/tools/update-responses/update_responses 
b/tools/update-responses/update_responses
index de24235..237a2be 100755
--- a/tools/update-responses/update_responses
+++ b/tools/update-responses/update_responses
@@ -565,21 +565,6 @@ sub download_version {
 my %sums = map { chomp; reverse split '  ', $_ }
  read_file "$destdir/sha256sums-signed-build.txt";
 
-my $martools = 'mar-tools-linux64.zip';
-exit_error "Error downloading $urldir/$martools\n"
-unless getstore("$urldir/$martools", "$tmpdir/$martools") == 200;
-exit_error "Error downloading $urldir/$martools.asc\n"
-unless getstore("$urldir/$martools.asc", "$tmpdir/$martools.asc") == 
200;
-if (system('gpg', '--no-default-keyring', '--keyring',
-"$FindBin::Bin/$config->{download}{gpg_keyring}", '--verify',
-"$tmpdir/$martools.asc", "$tmpdir/$martools")) {
-exit_error "Error checking gpg signature for $version/$martools";
-}
-exit_error "Wrong checksum for $version/$martools"
-unless $sums{$martools} eq sha256_hex(read_file("$tmpdir/$martools"));
-move "$tmpdir/$martools", "$destdir/$martools";
-move "$tmpdir/$martools.asc", "$destdir/$martools.asc";
-
 foreach my $file (sort grep { $_ =~ m/\.mar$/ } keys %sums) {
 print "Downloading $file\n";
 exit_error "Error downloading $urldir/$file\n"

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

[tor-commits] [tor-browser-build/master] Bug 40239: Don't download mar tools from old versions

2021-02-19 Thread sysrqb

commit e979fe32266998a508821669a613f6101875bd51
Author: Nicolas Vigier 
Date:   Fri Feb 19 17:04:43 2021 +0100

Bug 40239: Don't download mar tools from old versions

Before generating incremental mar files, we download mar files and
mar-tools-linux64.zip from the previous version. However we use
mar-tools from the new version and don't use the one from the old
version, so there is no need to download it.
---
 tools/update-responses/update_responses | 15 ---
 1 file changed, 15 deletions(-)

diff --git a/tools/update-responses/update_responses 
b/tools/update-responses/update_responses
index 35b971f..e897563 100755
--- a/tools/update-responses/update_responses
+++ b/tools/update-responses/update_responses
@@ -565,21 +565,6 @@ sub download_version {
 my %sums = map { chomp; reverse split '  ', $_ }
  read_file "$destdir/sha256sums-signed-build.txt";
 
-my $martools = 'mar-tools-linux64.zip';
-exit_error "Error downloading $urldir/$martools\n"
-unless getstore("$urldir/$martools", "$tmpdir/$martools") == 200;
-exit_error "Error downloading $urldir/$martools.asc\n"
-unless getstore("$urldir/$martools.asc", "$tmpdir/$martools.asc") == 
200;
-if (system('gpg', '--no-default-keyring', '--keyring',
-"$FindBin::Bin/$config->{download}{gpg_keyring}", '--verify',
-"$tmpdir/$martools.asc", "$tmpdir/$martools")) {
-exit_error "Error checking gpg signature for $version/$martools";
-}
-exit_error "Wrong checksum for $version/$martools"
-unless $sums{$martools} eq sha256_hex(read_file("$tmpdir/$martools"));
-move "$tmpdir/$martools", "$destdir/$martools";
-move "$tmpdir/$martools.asc", "$destdir/$martools.asc";
-
 foreach my $file (sort grep { $_ =~ m/\.mar$/ } keys %sums) {
 print "Downloading $file\n";
 exit_error "Error downloading $urldir/$file\n"

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

[tor-commits] [sbws/master] fix: resultdump: Log if relay was measured as exit

2021-02-19 Thread juga

commit beaf6de889bc75d53a6b0b90d12ab85aa0db56a0
Author: juga0 
Date:   Wed Feb 3 13:15:45 2021 +

fix: resultdump: Log if relay was measured as exit

or entry.

Closes #40048
---
 sbws/lib/resultdump.py | 4 
 1 file changed, 4 insertions(+)

diff --git a/sbws/lib/resultdump.py b/sbws/lib/resultdump.py
index 542837e..6673e9a 100644
--- a/sbws/lib/resultdump.py
+++ b/sbws/lib/resultdump.py
@@ -792,6 +792,10 @@ class ResultDump:
   "destination {}: {}".format(
 result.fingerprint, result.nickname, result.circ,
 result.dest_url, result.msg)
+# The result doesn't store the exit policies, so it can't be logged
+# whether it was an exit.
+as_exit = result.circ[1] == result.fingerprint
+msg += ". As exit." if as_exit else ". As entry."
 # When the error is that there are not more functional destinations.
 if result.type == "error-destination":
 log.info("Shutting down because there are not functional "



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

[tor-commits] [sbws/master] Merge branch 'maint-1.1'

2021-02-19 Thread juga

commit 749540147d79cec2aff487fd2a736c2e38f6d1e3
Merge: c8d1cc4 e375cd2
Author: juga0 
Date:   Fri Feb 19 17:51:43 2021 +

Merge branch 'maint-1.1'

 .gitignore |   1 +
 AUTHORS.md |   3 +-
 README.md  |   3 +-
 docs/source/conf.py|   2 +-
 docs/source/config.rst |   4 +-
 docs/source/config_tor.rst |  14 ++-
 docs/source/how_works.rst  |   3 +-
 .../images/20210111_consensushealth_bwauths.png| Bin 0 -> 100029 bytes
 docs/source/man_sbws.ini.rst   |  47 ---
 docs/source/monitoring_bandwidth.rst   |   2 +-
 docs/source/torflow_aggr.rst   |   2 +-
 sbws/config.default.ini|  14 ++-
 sbws/core/cleanup.py   |  25 
 sbws/core/generate.py  |   9 +-
 sbws/core/scanner.py   |  32 +++--
 sbws/globals.py|  23 ++--
 sbws/lib/circuitbuilder.py |  78 ++--
 sbws/lib/relaylist.py  |  32 ++---
 sbws/lib/relayprioritizer.py   |   1 +
 sbws/lib/resultdump.py |   7 +-
 sbws/lib/v3bwfile.py   |  12 +-
 sbws/util/config.py|   4 +-
 sbws/util/stem.py  | 107 ++--
 tests/integration/chutney_data/bwscanner   |  15 +++
 .../integration/chutney_data/client_bwscanner.tmpl |  23 
 tests/integration/chutney_data/non-exit.tmpl   |   4 +
 tests/integration/chutney_data/relay-MAB.tmpl  |   4 +
 tests/integration/chutney_data/relay-MBR.tmpl  |   4 +
 tests/integration/conftest.py  |  14 +--
 tests/integration/core/test_scanner.py |   2 +
 tests/integration/lib/test_circuitbuilder.py   |  20 +--
 tests/integration/lib/test_destination.py  |   6 +-
 tests/integration/lib/test_relaylist.py|  16 +--
 tests/integration/lib/test_relayprioritizer.py |  30 ++---
 tests/integration/net/auth1/fingerprint|   1 -
 .../net/auth1/keys/authority_certificate   |  45 ---
 .../net/auth1/keys/authority_identity_key  |  41 ---
 .../net/auth1/keys/authority_signing_key   |  27 
 .../net/auth1/keys/ed25519_master_id_public_key| Bin 64 -> 0 bytes
 .../net/auth1/keys/ed25519_master_id_secret_key| Bin 96 -> 0 bytes
 .../net/auth1/keys/ed25519_signing_cert| Bin 172 -> 0 bytes
 .../net/auth1/keys/ed25519_signing_secret_key  | Bin 96 -> 0 bytes
 tests/integration/net/auth1/keys/secret_id_key |  15 ---
 tests/integration/net/auth1/keys/secret_onion_key  |  15 ---
 .../net/auth1/keys/secret_onion_key_ntor   | Bin 96 -> 0 bytes
 tests/integration/net/auth1/torrc  |  33 -
 tests/integration/net/auth2/fingerprint|   1 -
 .../net/auth2/keys/authority_certificate   |  45 ---
 .../net/auth2/keys/authority_identity_key  |  41 ---
 .../net/auth2/keys/authority_signing_key   |  27 
 .../net/auth2/keys/ed25519_master_id_public_key| Bin 64 -> 0 bytes
 .../net/auth2/keys/ed25519_master_id_secret_key| Bin 96 -> 0 bytes
 .../net/auth2/keys/ed25519_signing_cert| Bin 172 -> 0 bytes
 .../net/auth2/keys/ed25519_signing_secret_key  | Bin 96 -> 0 bytes
 tests/integration/net/auth2/keys/secret_id_key |  15 ---
 tests/integration/net/auth2/keys/secret_onion_key  |  15 ---
 .../net/auth2/keys/secret_onion_key_ntor   | Bin 96 -> 0 bytes
 tests/integration/net/auth2/torrc  |  33 -
 tests/integration/net/auth3/fingerprint|   1 -
 .../net/auth3/keys/authority_certificate   |  45 ---
 .../net/auth3/keys/authority_identity_key  |  41 ---
 .../net/auth3/keys/authority_signing_key   |  27 
 .../net/auth3/keys/ed25519_master_id_public_key| Bin 64 -> 0 bytes
 .../net/auth3/keys/ed25519_master_id_secret_key| Bin 96 -> 0 bytes
 .../net/auth3/keys/ed25519_signing_cert| Bin 172 -> 0 bytes
 .../net/auth3/keys/ed25519_signing_secret_key  | Bin 96 -> 0 bytes
 tests/integration/net/auth3/keys/secret_id_key |  15 ---
 tests/integration/net/auth3/keys/secret_onion_key  |  15 ---
 .../net/auth3/keys/secret_onion_key_ntor   | Bin 96 -> 0 bytes
 tests/integration/net/auth3/torrc  |  33 -
 tests/integration/net/exit1/fingerprint|   1 -
 .../net/exit1/keys/ed25519_master_id_public_key| Bin 64 -> 0 bytes
 .../net/exit1/keys/ed25519_master_id_secret_key| Bin 96 -> 0 bytes
 .../net/exit1/keys/ed25519_signing_cert| Bin 172 -> 0 bytes
 .../net/exit1/keys/e

[tor-commits] [sbws/master] chg: stem: Set default torrc options

2021-02-19 Thread juga

commit 5f5f968a5fc65ea334b96e6deeda934980b371e6
Author: juga0 
Date:   Thu Dec 17 15:09:39 2020 +

chg: stem: Set default torrc options

when connecting to an external tor and they are not already set.
---
 sbws/util/stem.py | 38 +++---
 1 file changed, 35 insertions(+), 3 deletions(-)

diff --git a/sbws/util/stem.py b/sbws/util/stem.py
index 4e8f321..9fea31f 100644
--- a/sbws/util/stem.py
+++ b/sbws/util/stem.py
@@ -161,6 +161,16 @@ def parse_user_torrc_config(torrc, torrc_text):
 return torrc_dict
 
 
+def set_torrc_starting_point(controller):
+"""Set the torrc starting point options."""
+for k, v in TORRC_STARTING_POINT.items():
+try:
+controller.set_conf(k, v)
+except (ControllerError, InvalidRequest, InvalidArguments) as e:
+log.exception("Error setting option %s, %s: %s", k, v, e)
+exit(1)
+
+
 def set_torrc_runtime_options(controller):
 """Set torrc options at runtime."""
 try:
@@ -228,16 +238,16 @@ def launch_tor(conf):
 
 
 def launch_or_connect_to_tor(conf):
-# If connecting to an existing controller, there is no need to configure
-# own tor.
 cont = init_controller(conf)
 if not cont:
 cont = launch_tor(conf)
+else:
+if not is_torrc_starting_point_set(cont):
+set_torrc_starting_point(cont)
 # Set options that can fail at runtime
 set_torrc_options_can_fail(cont)
 # Set runtime options
 set_torrc_runtime_options(cont)
-
 log.info('Started or connected to Tor %s.', cont.get_version())
 return cont
 
@@ -293,3 +303,25 @@ def circuit_str(controller, circ_id):
 return '[' +\
 ' -> '.join(['{} ({})'.format(n, fp[0:8]) for fp, n in circ.path]) +\
 ']'
+
+
+def is_torrc_starting_point_set(tor_controller):
+"""Verify that the tor controller has the correct configuration.
+
+When connecting to a tor controller that has not been launched by sbws,
+it should have been configured to work with sbws.
+
+"""
+bad_options = False
+torrc = TORRC_STARTING_POINT
+for k, v in torrc.items():
+value_set = tor_controller.get_conf(k)
+if v != value_set:
+log.exception(
+"Uncorrectly configured %s, should be %s, is %s",
+k, v, value_set
+)
+bad_options = True
+if not bad_options:
+log.info("Tor is correctly configured to work with sbws.")
+return bad_options



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

[tor-commits] [sbws/master] fix: test: Add chutney configuration

2021-02-19 Thread juga

commit 212047f4c4601d263078cde4338060704d026d78
Author: juga0 
Date:   Thu Dec 17 15:30:11 2020 +

fix: test: Add chutney configuration

and scripts to run the integration tests with chutney.
It does not replace yet the way integration tests are run.
---
 .gitignore |  1 +
 tests/integration/chutney_data/bwscanner   | 15 +
 .../integration/chutney_data/client_bwscanner.tmpl | 23 +++
 tests/integration/chutney_data/non-exit.tmpl   |  4 
 tests/integration/chutney_data/relay-MAB.tmpl  |  4 
 tests/integration/chutney_data/relay-MBR.tmpl  |  4 
 tests/integration/run.sh   | 14 
 tests/integration/start_chutney.sh | 26 ++
 tests/integration/stop_chutney.sh  | 10 +
 9 files changed, 101 insertions(+)

diff --git a/.gitignore b/.gitignore
index 9903d5d..744436b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@ htmlcov
 dist
 build
 *.lockfile
+chutney
diff --git a/tests/integration/chutney_data/bwscanner 
b/tests/integration/chutney_data/bwscanner
new file mode 100644
index 000..6506bc3
--- /dev/null
+++ b/tests/integration/chutney_data/bwscanner
@@ -0,0 +1,15 @@
+# By default, Authorities are not configured as exits
+Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl")
+NonExitRelay = Node(tag="m", relay=1, exit=0, torrc="non-exit.tmpl")
+ExitRelay = Node(tag="r", relay=1, exit=1, torrc="relay.tmpl")
+Client = Node(tag="c", client=1, torrc="client_bwscanner.tmpl")
+RelayMAB = Node(tag="relay1mbyteMAB", relay=1, torrc="relay-MAB.tmpl")
+RelayMBR = Node(tag="relay1mbyteMBR", relay=1, torrc="relay-MBR.tmpl")
+
+NODES = Authority.getN(3) + \
+  NonExitRelay.getN(9) + \
+  ExitRelay.getN(3) + Client.getN(1)
+
+# RelayMBR.getN(1) + RelayMAB.getN(1) + \
+
+ConfigureNodes(NODES)
diff --git a/tests/integration/chutney_data/client_bwscanner.tmpl 
b/tests/integration/chutney_data/client_bwscanner.tmpl
new file mode 100644
index 000..dc6d0d8
--- /dev/null
+++ b/tests/integration/chutney_data/client_bwscanner.tmpl
@@ -0,0 +1,23 @@
+${include:common.i}
+SocksPort $socksport
+
+#NOTE: Setting TestingClientConsensusDownloadSchedule doesn't
+#  help -- dl_stats.schedule is not DL_SCHED_CONSENSUS
+#  at boostrap time.
+# Try to download after:
+# the minimum initial consensus time to start with,
+# a few eager fetches,
+# then half the minimum testing consensus interval
+#TestingClientDownloadSchedule 0, 5
+#TestingClientConsensusDownloadSchedule 0, 5
+#ControlPort 8015
+UseEntryGuards 0
+UseMicroDescriptors 0
+FetchDirInfoEarly 1
+FetchDirInfoExtraEarly 1
+FetchUselessDescriptors 1
+LearnCircuitBuildTimeout 0
+CircuitBuildTimeout 60
+ConnectionPadding 0
+__DisablePredictedCircuits 1
+__LeaveStreamsUnattached 1
diff --git a/tests/integration/chutney_data/non-exit.tmpl 
b/tests/integration/chutney_data/non-exit.tmpl
new file mode 100644
index 000..25d8806
--- /dev/null
+++ b/tests/integration/chutney_data/non-exit.tmpl
@@ -0,0 +1,4 @@
+${include:relay-non-exit.tmpl}
+
+ExitRelay 0
+ExitPolicy reject *:*
diff --git a/tests/integration/chutney_data/relay-MAB.tmpl 
b/tests/integration/chutney_data/relay-MAB.tmpl
new file mode 100644
index 000..28bc6a7
--- /dev/null
+++ b/tests/integration/chutney_data/relay-MAB.tmpl
@@ -0,0 +1,4 @@
+${include:non-exit.tmpl}
+
+Nickname relay1mbyteMAB
+MaxAdvertisedBandwidth 1 MBytes
diff --git a/tests/integration/chutney_data/relay-MBR.tmpl 
b/tests/integration/chutney_data/relay-MBR.tmpl
new file mode 100644
index 000..946600b
--- /dev/null
+++ b/tests/integration/chutney_data/relay-MBR.tmpl
@@ -0,0 +1,4 @@
+${include:non-exit.tmpl}
+
+Nickname relay1mbyteMBR
+RelayBandwidthRate 1 MBytes
diff --git a/tests/integration/run.sh b/tests/integration/run.sh
new file mode 100755
index 000..e870b50
--- /dev/null
+++ b/tests/integration/run.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+set -x
+
+tests/integration/start_chutney.sh
+python3 scripts/tools/sbws-http-server.py --port 2 &>/dev/null &
+sleep 1
+wget -O/dev/null http://127.0.0.1:2/sbws.bin
+# Run actually the scanner
+sbws -c tests/integration/sbws_testnet.ini scanner
+sbws -c tests/integration/sbws_testnet.ini generate
+# Run integration tests
+coverage run -a --rcfile=.coveragerc --source=sbws -m pytest -s 
tests/integration -vv
+sbws -c tests/integration/sbws_testnet.ini cleanup
+tests/integration/stop_chutney.sh
diff --git a/tests/integration/start_chutney.sh 
b/tests/integration/start_chutney.sh
new file mode 100755
index 000..04f9641
--- /dev/null
+++ b/tests/integration/start_chutney.sh
@@ -0,0 +1,26 @@
+#!/bin/bash
+set -x
+
+CURRENT_DIR=`pwd`
+CHUTNEY_DIR=${1:-./chutney}
+
+# If chutney dir already exists, this will fail but it doesn't matter.
+git clone https://git.torproject.org/chutney.git $CHUTNEY_DIR
+
+cp tests/integration/chutney_data/bwscanner $CHUTNEY_

[tor-commits] [sbws/master] fix: resultdump: Check that the error has a circuit

2021-02-19 Thread juga

commit e375cd28c8e19e3e9660547b134ef7759ad21e3f
Author: juga0 
Date:   Tue Feb 9 10:42:34 2021 +

fix: resultdump: Check that the error has a circuit

Because if the error is not a circuit error, it does not have that
attribute.
---
 sbws/lib/resultdump.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/sbws/lib/resultdump.py b/sbws/lib/resultdump.py
index 6673e9a..b287242 100644
--- a/sbws/lib/resultdump.py
+++ b/sbws/lib/resultdump.py
@@ -794,8 +794,9 @@ class ResultDump:
 result.dest_url, result.msg)
 # The result doesn't store the exit policies, so it can't be logged
 # whether it was an exit.
-as_exit = result.circ[1] == result.fingerprint
-msg += ". As exit." if as_exit else ". As entry."
+if result.circ:
+as_exit = result.circ[1] == result.fingerprint
+msg += ". As exit." if as_exit else ". As entry."
 # When the error is that there are not more functional destinations.
 if result.type == "error-destination":
 log.info("Shutting down because there are not functional "



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

[tor-commits] [sbws/master] Merge remote-tracking branch 'gitlab/merge-requests/56' into maint-1.1

2021-02-19 Thread juga

commit 7430b4ef9f4b0371502560126b5342dc4f117371
Merge: 96aadc6 e416547
Author: Georg Koppen 
Date:   Mon Jan 25 14:32:00 2021 +

Merge remote-tracking branch 'gitlab/merge-requests/56' into maint-1.1

 docs/source/how_works.rst|  3 ++-
 docs/source/man_sbws.ini.rst |  4 ++--
 sbws/config.default.ini  | 11 ---
 sbws/core/cleanup.py | 25 -
 sbws/core/generate.py|  9 ++---
 sbws/globals.py  | 12 +---
 6 files changed, 27 insertions(+), 37 deletions(-)



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

[tor-commits] [sbws/master] fix: stem: Move torrc option that does not depend on config

2021-02-19 Thread juga

commit 2d5a6b65704857b8abde4a867f0f6590c181325c
Author: juga0 
Date:   Thu Dec 17 14:40:36 2020 +

fix: stem: Move torrc option that does not depend on config

It seems we forgot this option when refactoring in #28738.
---
 sbws/globals.py   | 6 +-
 sbws/util/stem.py | 4 
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/sbws/globals.py b/sbws/globals.py
index 2434685..f5b3ec6 100644
--- a/sbws/globals.py
+++ b/sbws/globals.py
@@ -40,7 +40,11 @@ TORRC_STARTING_POINT = {
 'FetchDirInfoEarly': '1',
 'FetchDirInfoExtraEarly': '1',
 # To make Tor keep fetching descriptors, even when idle.
-'FetchUselessDescriptors': '1'
+'FetchUselessDescriptors': '1',
+# Things needed to make circuits fail a little faster. We get the
+# circuit_timeout as a string instead of an int on purpose: stem only
+# accepts strings.
+'LearnCircuitBuildTimeout': '0',
 }
 # Options that need to be set at runtime.
 TORRC_RUNTIME_OPTIONS = {
diff --git a/sbws/util/stem.py b/sbws/util/stem.py
index 5835237..4e8f321 100644
--- a/sbws/util/stem.py
+++ b/sbws/util/stem.py
@@ -206,10 +206,6 @@ def launch_tor(conf):
 'NOTICE file {}'.format(os.path.join(conf.getpath('tor', 'log'),
  'notice.log')),
 ],
-# Things needed to make circuits fail a little faster. We get the
-# circuit_timeout as a string instead of an int on purpose: stem only
-# accepts strings.
-'LearnCircuitBuildTimeout': '0',
 'CircuitBuildTimeout': conf['general']['circuit_timeout'],
 })
 



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

[tor-commits] [sbws/master] Merge remote-tracking branch 'gitlab/merge-requests/50' into maint-1.1

2021-02-19 Thread juga

commit c40e6e11f3d064f7c5fc8ec1895081ae673781fc
Merge: e37c472 cb6a8a7
Author: Georg Koppen 
Date:   Thu Jan 7 22:55:33 2021 +

Merge remote-tracking branch 'gitlab/merge-requests/50' into maint-1.1

 docs/source/man_sbws.ini.rst  |  4 +++
 sbws/config.default.ini   |  1 +
 sbws/core/scanner.py  | 18 ++--
 sbws/util/config.py   |  4 ++-
 sbws/util/stem.py | 66 +--
 tests/integration/conftest.py |  4 +--
 6 files changed, 45 insertions(+), 52 deletions(-)



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

[tor-commits] [sbws/master] fix: stem: Remove torrc option that is the default

2021-02-19 Thread juga

commit 15da07d6a447d8310354124f6020b4cf74b75488
Author: juga0 
Date:   Thu Dec 17 14:37:58 2020 +

fix: stem: Remove torrc option that is the default

to avoid conflict when comparing the options that should be set and the
ones are set, since the SocksPort will be differently in chutney.
---
 docs/source/config_tor.rst | 1 -
 sbws/globals.py| 3 ---
 2 files changed, 4 deletions(-)

diff --git a/docs/source/config_tor.rst b/docs/source/config_tor.rst
index e609468..b204ca2 100644
--- a/docs/source/config_tor.rst
+++ b/docs/source/config_tor.rst
@@ -9,7 +9,6 @@ connection to an existing Tor daemon.
 
 Default configuration:
 
-- ``SocksPort auto``: To proxy requests over Tor.
 - ``CookieAuthentication 1``: The easiest way to authenticate to Tor.
 - ``UseEntryGuards 0``: To avoid path bias warnings.
 - ``UseMicrodescriptors 0``: Because full server descriptors are needed.
diff --git a/sbws/globals.py b/sbws/globals.py
index 2e4481c..2434685 100644
--- a/sbws/globals.py
+++ b/sbws/globals.py
@@ -22,9 +22,6 @@ SPEC_VERSION = '1.5.0'
 # Options that are known at runtime (from configuration file) are added
 # in utils/stem.py launch_tor
 TORRC_STARTING_POINT = {
-# We will find out via the ControlPort and not setting something static
-# means a lower chance of conflict
-'SocksPort': 'auto',
 # Easier than password authentication
 'CookieAuthentication': '1',
 # To avoid path bias warnings



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

[tor-commits] [sbws/master] fix: tests: Run integration tests with chutney

2021-02-19 Thread juga

commit 5b8c47a1e3af95357381191106d1c9fd7d060852
Author: juga0 
Date:   Thu Dec 17 15:36:50 2020 +

fix: tests: Run integration tests with chutney

and adapt the tests to pass.
\o/

Closes: #40008.
---
 sbws/lib/relaylist.py  |   5 +-
 tests/integration/conftest.py  |  10 +-
 tests/integration/core/test_scanner.py |   2 +
 tests/integration/lib/test_circuitbuilder.py   |  20 +--
 tests/integration/lib/test_destination.py  |   6 +-
 tests/integration/lib/test_relaylist.py|  16 +--
 tests/integration/lib/test_relayprioritizer.py |  30 ++---
 tests/integration/net/auth1/fingerprint|   1 -
 .../net/auth1/keys/authority_certificate   |  45 ---
 .../net/auth1/keys/authority_identity_key  |  41 ---
 .../net/auth1/keys/authority_signing_key   |  27 
 .../net/auth1/keys/ed25519_master_id_public_key| Bin 64 -> 0 bytes
 .../net/auth1/keys/ed25519_master_id_secret_key| Bin 96 -> 0 bytes
 .../net/auth1/keys/ed25519_signing_cert| Bin 172 -> 0 bytes
 .../net/auth1/keys/ed25519_signing_secret_key  | Bin 96 -> 0 bytes
 tests/integration/net/auth1/keys/secret_id_key |  15 ---
 tests/integration/net/auth1/keys/secret_onion_key  |  15 ---
 .../net/auth1/keys/secret_onion_key_ntor   | Bin 96 -> 0 bytes
 tests/integration/net/auth1/torrc  |  33 -
 tests/integration/net/auth2/fingerprint|   1 -
 .../net/auth2/keys/authority_certificate   |  45 ---
 .../net/auth2/keys/authority_identity_key  |  41 ---
 .../net/auth2/keys/authority_signing_key   |  27 
 .../net/auth2/keys/ed25519_master_id_public_key| Bin 64 -> 0 bytes
 .../net/auth2/keys/ed25519_master_id_secret_key| Bin 96 -> 0 bytes
 .../net/auth2/keys/ed25519_signing_cert| Bin 172 -> 0 bytes
 .../net/auth2/keys/ed25519_signing_secret_key  | Bin 96 -> 0 bytes
 tests/integration/net/auth2/keys/secret_id_key |  15 ---
 tests/integration/net/auth2/keys/secret_onion_key  |  15 ---
 .../net/auth2/keys/secret_onion_key_ntor   | Bin 96 -> 0 bytes
 tests/integration/net/auth2/torrc  |  33 -
 tests/integration/net/auth3/fingerprint|   1 -
 .../net/auth3/keys/authority_certificate   |  45 ---
 .../net/auth3/keys/authority_identity_key  |  41 ---
 .../net/auth3/keys/authority_signing_key   |  27 
 .../net/auth3/keys/ed25519_master_id_public_key| Bin 64 -> 0 bytes
 .../net/auth3/keys/ed25519_master_id_secret_key| Bin 96 -> 0 bytes
 .../net/auth3/keys/ed25519_signing_cert| Bin 172 -> 0 bytes
 .../net/auth3/keys/ed25519_signing_secret_key  | Bin 96 -> 0 bytes
 tests/integration/net/auth3/keys/secret_id_key |  15 ---
 tests/integration/net/auth3/keys/secret_onion_key  |  15 ---
 .../net/auth3/keys/secret_onion_key_ntor   | Bin 96 -> 0 bytes
 tests/integration/net/auth3/torrc  |  33 -
 tests/integration/net/exit1/fingerprint|   1 -
 .../net/exit1/keys/ed25519_master_id_public_key| Bin 64 -> 0 bytes
 .../net/exit1/keys/ed25519_master_id_secret_key| Bin 96 -> 0 bytes
 .../net/exit1/keys/ed25519_signing_cert| Bin 172 -> 0 bytes
 .../net/exit1/keys/ed25519_signing_secret_key  | Bin 96 -> 0 bytes
 tests/integration/net/exit1/keys/secret_id_key |  15 ---
 tests/integration/net/exit1/keys/secret_onion_key  |  15 ---
 .../net/exit1/keys/secret_onion_key_ntor   | Bin 96 -> 0 bytes
 tests/integration/net/exit1/torrc  |  26 
 tests/integration/net/exit2/fingerprint|   1 -
 .../net/exit2/keys/ed25519_master_id_public_key| Bin 64 -> 0 bytes
 .../net/exit2/keys/ed25519_master_id_secret_key| Bin 96 -> 0 bytes
 .../net/exit2/keys/ed25519_signing_cert| Bin 172 -> 0 bytes
 .../net/exit2/keys/ed25519_signing_secret_key  | Bin 96 -> 0 bytes
 tests/integration/net/exit2/keys/secret_id_key |  15 ---
 tests/integration/net/exit2/keys/secret_onion_key  |  15 ---
 .../net/exit2/keys/secret_onion_key_ntor   | Bin 96 -> 0 bytes
 tests/integration/net/exit2/torrc  |  26 
 tests/integration/net/exit3/fingerprint|   1 -
 .../net/exit3/keys/ed25519_master_id_public_key| Bin 64 -> 0 bytes
 .../net/exit3/keys/ed25519_master_id_secret_key| Bin 96 -> 0 bytes
 .../net/exit3/keys/ed25519_signing_cert| Bin 172 -> 0 bytes
 .../net/exit3/keys/ed25519_signing_secret_key  | Bin 96 -> 0 bytes
 tests/integration/net/exit3/keys/secret_id_key |  15 ---
 tests/integration/net/exit3/keys/secret_onion_key  |  15 ---
 .../net/exit3/keys/secret_onion_key_ntor   | Bin 96 -> 0 bytes
 tests/integration/net/exit3/torrc  |  26 
 tests/integration/net/relay1/fingerprint   |   1 -
 .../net/relay1/keys/ed25519_master_id_publ

[tor-commits] [sbws/master] chg: generate, cleanup: Use 28 days of measurements

2021-02-19 Thread juga

commit e416547c73d166bd085a10843c6ba4d1a4167092
Author: juga0 
Date:   Sat Jan 23 09:54:19 2021 +

chg: generate, cleanup: Use 28 days of measurements

When generating the Bandwidth File as Torflow, use 28 days of past raw
measurements instead of 5, by default.
Also keep the raw measurements for that long before compressing or
deleting them.
And stop checking whether the compression and delete
periods are valid, without checking defaults first and based on
arbitrary values.

Closes: #40017
---
 docs/source/how_works.rst|  3 ++-
 docs/source/man_sbws.ini.rst |  4 ++--
 sbws/config.default.ini  | 11 ---
 sbws/core/cleanup.py | 25 -
 sbws/core/generate.py|  9 ++---
 sbws/globals.py  | 12 +---
 6 files changed, 27 insertions(+), 37 deletions(-)

diff --git a/docs/source/how_works.rst b/docs/source/how_works.rst
index f7d7533..24f8689 100644
--- a/docs/source/how_works.rst
+++ b/docs/source/how_works.rst
@@ -137,7 +137,8 @@ Each relay bandwidth measurements are selected in the 
following way:
If they are not, the relay MUST NOT be included in the Bandwith File.
 #. The measurements than are are older than an arbitrary number of senconds
in the past MUST be discarded.
-   Currently this number is the same as ``data_period`` (5 days).
+   Currently this number is the same as ``data_period`` (5 days) when not
+   scaling as Torflow and 28 days when scaling as Torflow.
 
 If the number of relays to include in the Bandwidth File are less than
 a percententage (currently 60%) than the number of relays in the consensus,
diff --git a/docs/source/man_sbws.ini.rst b/docs/source/man_sbws.ini.rst
index e2127ab..31effc7 100644
--- a/docs/source/man_sbws.ini.rst
+++ b/docs/source/man_sbws.ini.rst
@@ -143,9 +143,9 @@ relayprioritizer
 
 cleanup
   data_files_compress_after_days = INT
-After this many days, compress data files. (Default: 10)
+After this many days, compress data files. (Default: 29)
   data_files_delete_after_days = INT
-After this many days, delete data files. (Default: 90)
+After this many days, delete data files. (Default: 57)
   v3bw_files_compress_after_days = INT
 After this many days, compress v3bw files. (Default: 1)
   v3bw_files_delete_after_days = INT
diff --git a/sbws/config.default.ini b/sbws/config.default.ini
index 0105527..c47e4fd 100644
--- a/sbws/config.default.ini
+++ b/sbws/config.default.ini
@@ -71,9 +71,14 @@ extra_lines =
 
 [cleanup]
 # After this many days, compress data files
-data_files_compress_after_days = 10
-# After this many days, delete data files
-data_files_delete_after_days = 90
+# #40017: To generate files as Torflow the result files must be kept for
+# GENERATE_PERIOD seconds.
+# The number of days after they are compressed or deleted could be added
+# as defaults (currently globals.py), and just as a factor of GENERATE_PERIOD.
+data_files_compress_after_days = 29
+# After this many days, delete data files.
+# 57 == 28 * 2 + 1.
+data_files_delete_after_days = 57
 # After this many days, compress v3bw files (1d)
 v3bw_files_compress_after_days = 1
 # After this many days, delete v3bw files (7d)
diff --git a/sbws/core/cleanup.py b/sbws/core/cleanup.py
index aa16fba..1d21989 100644
--- a/sbws/core/cleanup.py
+++ b/sbws/core/cleanup.py
@@ -99,28 +99,6 @@ def _check_validity_periods_v3bw(compress_after_days, 
delete_after_days):
   "after a bigger number of days.")
 
 
-def _check_validity_periods_results(
-data_period, compress_after_days, delete_after_days):
-if compress_after_days - 2 < data_period:
-fail_hard(
-'For safetly, cleanup/data_files_compress_after_days (%d) must be '
-'at least 2 days larger than general/data_period (%d)',
-compress_after_days, data_period)
-if delete_after_days < compress_after_days:
-fail_hard(
-'cleanup/data_files_delete_after_days (%d) must be the same or '
-'larger than cleanup/data_files_compress_after_days (%d)',
-delete_after_days, compress_after_days)
-if compress_after_days / 2 < data_period:
-log.warning(
-'cleanup/data_files_compress_after_days (%d) is less than twice '
-'general/data_period (%d). For ease of parsing older results '
-'if necessary, it is recommended to make '
-'data_files_compress_after_days at least twice the data_period.',
-compress_after_days, data_period)
-return True
-
-
 def _clean_v3bw_files(args, conf):
 v3bw_dname = conf.getpath('paths', 'v3bw_dname')
 if not os.path.isdir(v3bw_dname):
@@ -147,13 +125,10 @@ def _clean_result_files(args, conf):
 datadir = conf.getpath('paths', 'datadir')
 if not os.path.isdir(datadir):
 fail_hard('%s does not exist', datadir)
-data_period = conf.getint('general', 'data_period')
 compress_after_days = conf

[tor-commits] [sbws/master] Merge remote-tracking branch 'gitlab/merge-requests/53' into maint-1.1

2021-02-19 Thread juga

commit 6dc6e94bd0509ddc329c14f3edc4188bfa9716e8
Merge: c40e6e1 8805a1d
Author: Georg Koppen 
Date:   Mon Jan 11 09:28:54 2021 +

Merge remote-tracking branch 'gitlab/merge-requests/53' into maint-1.1

 .../source/images/20210111_consensushealth_bwauths.png | Bin 0 -> 100029 bytes
 docs/source/monitoring_bandwidth.rst   |   2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)



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

[tor-commits] [sbws/master] Merge branch 'bug_40036_v3' into 'maint-1.1'

2021-02-19 Thread juga

commit 38649f0f938bcc4496fd47699cc4f29f78547293
Merge: 6dc6e94 c931dd0
Author: juga 
Date:   Thu Jan 14 10:23:06 2021 +

Merge branch 'bug_40036_v3' into 'maint-1.1'

fix: doc: Sphinx warnings when creating documentation

Closes #40036

See merge request tpo/network-health/sbws!54

 AUTHORS.md   | 3 ++-
 README.md| 3 ++-
 docs/source/conf.py  | 2 +-
 docs/source/torflow_aggr.rst | 2 +-
 sbws/lib/relaylist.py| 5 +++--
 sbws/lib/relayprioritizer.py | 1 +
 sbws/lib/resultdump.py   | 2 +-
 sbws/lib/v3bwfile.py | 2 +-
 sbws/util/stem.py| 3 ++-
 9 files changed, 14 insertions(+), 9 deletions(-)



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

[tor-commits] [sbws/master] Merge remote-tracking branch 'gitlab/merge-requests/51' into maint-1.1

2021-02-19 Thread juga

commit 96aadc69d0da29d2b85cba08c549c9ccf82a70fc
Merge: 38649f0 a050110
Author: Georg Koppen 
Date:   Mon Jan 25 11:21:59 2021 +

Merge remote-tracking branch 'gitlab/merge-requests/51' into maint-1.1

 sbws/lib/relaylist.py| 17 +
 tests/unit/lib/test_relaylist.py |  8 
 2 files changed, 9 insertions(+), 16 deletions(-)




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

[tor-commits] [sbws/master] fix: doc: Sphinx warnings when creating documentation

2021-02-19 Thread juga

commit c931dd014e7fce265da9a46dd48fb9c304c0efeb
Author: Georg Koppen 
Date:   Mon Dec 21 09:30:39 2020 +

fix: doc: Sphinx warnings when creating documentation

This should give us at least a clean html, text, and man build
experience.

Closes #40036.
---
 AUTHORS.md   | 3 ++-
 README.md| 3 ++-
 docs/source/conf.py  | 2 +-
 docs/source/torflow_aggr.rst | 2 +-
 sbws/lib/relaylist.py| 5 +++--
 sbws/lib/relayprioritizer.py | 1 +
 sbws/lib/resultdump.py   | 2 +-
 sbws/lib/v3bwfile.py | 2 +-
 sbws/util/stem.py| 3 ++-
 9 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/AUTHORS.md b/AUTHORS.md
index 4eaef8f..1e8641e 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -1,4 +1,5 @@
-# Authors
+Authors
+===
 
 The following people have contributed to Simple Bandwidth Scanner.
 Thank you for helping make Tor better.
diff --git a/README.md b/README.md
index 852d02c..fe12cba 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,5 @@
-# Readme
+Readme
+==
 
 [![Build 
Status](https://travis-ci.org/torproject/sbws.svg?branch=master)](https://travis-ci.org/https://travis-ci.org/torproject/sbws)
 
diff --git a/docs/source/conf.py b/docs/source/conf.py
index 3dc8660..1f33c71 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -97,7 +97,7 @@ html_theme = 'nature'
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = ['_static']
+html_static_path = []
 
 # Custom sidebar templates, must be a dictionary that maps document names
 # to template names.
diff --git a/docs/source/torflow_aggr.rst b/docs/source/torflow_aggr.rst
index 5b4b3fd..bc9420d 100644
--- a/docs/source/torflow_aggr.rst
+++ b/docs/source/torflow_aggr.rst
@@ -426,4 +426,4 @@ oldest measurements are 5 days old::
 .. _SQLSupport.py: 
https://gitweb.torproject.org/pytorctl.git/tree/SQLSupport.py#n493
 .. _bandwidth file spec: 
https://gitweb.torproject.org/torspec.git/tree/bandwidth-file-spec.txt
 .. _aggregate.py: 
https://gitweb.torproject.org/torflow.git/tree/NetworkScanners/BwAuthority/aggregate.py
-.. _TorCtly.py: https://gitweb.torproject.org/pytorctl.git/tree/TorCtl.py
+.. _TorCtl.py: https://gitweb.torproject.org/pytorctl.git/tree/TorCtl.py
diff --git a/sbws/lib/relaylist.py b/sbws/lib/relaylist.py
index 8a07ce7..bc6b5ce 100644
--- a/sbws/lib/relaylist.py
+++ b/sbws/lib/relaylist.py
@@ -24,6 +24,7 @@ def valid_after_from_network_statuses(network_statuses):
 attribute of a ``stem.descriptor.RouterStatusEntryV3``.
 
 :param list network_statuses:
+
 returns datetime:
 """
 for ns in network_statuses:
@@ -228,7 +229,7 @@ class Relay:
 Increment The number of times that a relay has been queued
 to be measured.
 
-It is call from :funf:`~sbws.core.scaner.main_loop`.
+It is call from :func:`~sbws.core.scaner.main_loop`.
 """
 self.relay_recent_measurement_attempt.update()
 
@@ -468,7 +469,7 @@ class RelayList:
 Increment the number of times that any relay has been queued to be
 measured.
 
-It is call from :funf:`~sbws.core.scaner.main_loop`.
+It is call from :func:`~sbws.core.scaner.main_loop`.
 
 It is read and stored in a ``state`` file.
 """
diff --git a/sbws/lib/relayprioritizer.py b/sbws/lib/relayprioritizer.py
index ef45391..2d6a488 100644
--- a/sbws/lib/relayprioritizer.py
+++ b/sbws/lib/relayprioritizer.py
@@ -97,6 +97,7 @@ class RelayPrioritizer:
 measurements that did not succed.
 :param bool return_fraction: whether to return only a fraction of the
 relays seen in the network or return all.
+
 return: a generator of the new ordered list of relays to measure next.
 
 """
diff --git a/sbws/lib/resultdump.py b/sbws/lib/resultdump.py
index 9792fde..542837e 100644
--- a/sbws/lib/resultdump.py
+++ b/sbws/lib/resultdump.py
@@ -558,7 +558,7 @@ class ResultErrorSecondRelay(ResultError):
 
 A second suitable relay is a relay that:
 - Has at least equal bandwidth as the relay to measure.
-- If the relay to measure is not an exit,
+- If the relay to measure is not an exit, \
   the second relay is an exit without `bad` flag and can exit to port 443.
 - If the relay to measure is an exit, the second relay is not an exit.
 
diff --git a/sbws/lib/v3bwfile.py b/sbws/lib/v3bwfile.py
index 553265b..362c696 100644
--- a/sbws/lib/v3bwfile.py
+++ b/sbws/lib/v3bwfile.py
@@ -625,7 +625,7 @@ class V3BWLine(object):
 :param dict kwargs: extra headers.
 
 .. note:: tech-debt: move node_id and bw to kwargs and just ensure that
-   the required values are in **kwargs
+   the required values are in ``**kwargs``
 """
 def __init__(self, node_id, bw, **kwargs

[tor-commits] [sbws/master] fix: stem: Add possible exception cause

2021-02-19 Thread juga

commit cb6a8a76da0d77ef2896c9f99003649b3d43c1b4
Author: juga0 
Date:   Wed Dec 16 15:55:13 2020 +

fix: stem: Add possible exception cause
---
 sbws/util/stem.py | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/sbws/util/stem.py b/sbws/util/stem.py
index 5605c29..ce5253c 100644
--- a/sbws/util/stem.py
+++ b/sbws/util/stem.py
@@ -181,9 +181,12 @@ def set_torrc_options_can_fail(controller):
 for k, v in TORRC_OPTIONS_CAN_FAIL.items():
 try:
 controller.set_conf(k, v)
-except InvalidArguments as error:
+except (InvalidArguments, InvalidRequest) as error:
 log.debug('Ignoring option not supported by this Tor version. %s',
   error)
+except ControllerError as e:
+log.exception(e)
+exit(1)
 
 
 def launch_tor(conf):



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

[tor-commits] [sbws/master] chg: stem: Add function to connect or start tor

2021-02-19 Thread juga

commit f7847ed28cab55bd1260d307b42c4ef59772937a
Author: juga0 
Date:   Wed Dec 16 15:51:55 2020 +

chg: stem: Add function to connect or start tor

Move initialization via existing socket to this new function and start
tor only when it fails.

Closes: #33150.
---
 sbws/core/scanner.py  | 17 ++---
 sbws/util/stem.py | 22 --
 tests/integration/conftest.py |  4 ++--
 3 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/sbws/core/scanner.py b/sbws/core/scanner.py
index bcbeb47..312993a 100644
--- a/sbws/core/scanner.py
+++ b/sbws/core/scanner.py
@@ -679,21 +679,8 @@ def run_speedtest(args, conf):
 
 """
 global rd, pool, controller
-controller = stem_utils.init_controller(conf)
-if not controller:
-controller = stem_utils.launch_tor(conf)
-else:
-log.warning(
-'Is sbws already running? '
-'We found an existing Tor process at %s. We are not going to '
-'launch Tor, nor are we going to try to configure it to behave '
-'like we expect. This might work okay, but it also might not. '
-'If you experience problems, you should try letting sbws launch '
-'Tor for itself. The ability to use an already running Tor only '
-'exists for sbws developers. It is expected to be broken and may '
-'even lead to messed up results.',
-conf.getpath('tor', 'control_socket'))
-time.sleep(15)
+
+controller = stem_utils.launch_or_connect_to_tor(conf)
 
 # When there will be a refactor where conf is global, this can be removed
 # from here.
diff --git a/sbws/util/stem.py b/sbws/util/stem.py
index 169acda..5605c29 100644
--- a/sbws/util/stem.py
+++ b/sbws/util/stem.py
@@ -6,7 +6,6 @@ from stem import (SocketError, InvalidRequest, 
UnsatisfiableRequest,
   ProtocolError, SocketClosed)
 from stem.connection import IncorrectSocketType
 import stem.process
-from configparser import ConfigParser
 from threading import RLock
 import copy
 import logging
@@ -68,10 +67,8 @@ def init_controller(conf):
 control_port = int(control_port)
 # If it can not connect, the program will exit here
 c = _init_controller_port(control_port)
-else:
-c = _init_controller_socket(
-socket=conf.getpath('tor', 'control_socket')
-)
+# There is no configuration for external control socket, therefore do not
+# attempt to connect to the control socket.
 return c
 
 
@@ -190,7 +187,6 @@ def set_torrc_options_can_fail(controller):
 
 
 def launch_tor(conf):
-assert isinstance(conf, ConfigParser)
 os.makedirs(conf.getpath('tor', 'datadir'), mode=0o700, exist_ok=True)
 os.makedirs(conf.getpath('tor', 'log'), exist_ok=True)
 os.makedirs(conf.getpath('tor', 'run_dpath'), mode=0o700, exist_ok=True)
@@ -216,6 +212,8 @@ def launch_tor(conf):
 torrc = parse_user_torrc_config(torrc, conf['tor']['extra_lines'])
 # Finally launch Tor
 try:
+# If there is already a tor process running with the same control
+# socket, this will exit here.
 stem.process.launch_tor_with_config(
 torrc, init_msg_handler=log.debug, take_ownership=True)
 except Exception as e:
@@ -223,6 +221,18 @@ def launch_tor(conf):
 log.info("Started own tor.")
 # And return a controller to it
 cont = _init_controller_socket(conf.getpath('tor', 'control_socket'))
+# In the case it was not possible to connect to own tor socket.
+if not cont:
+fail_hard('Could not connect to own tor control socket.')
+return cont
+
+
+def launch_or_connect_to_tor(conf):
+# If connecting to an existing controller, there is no need to configure
+# own tor.
+cont = init_controller(conf)
+if not cont:
+cont = launch_tor(conf)
 # Set options that can fail at runtime
 set_torrc_options_can_fail(cont)
 # Set runtime options
diff --git a/tests/integration/conftest.py b/tests/integration/conftest.py
index afd7256..2c0e675 100644
--- a/tests/integration/conftest.py
+++ b/tests/integration/conftest.py
@@ -7,7 +7,7 @@ from sbws.lib.circuitbuilder import GapsCircuitBuilder as CB
 from sbws.lib.destination import DestinationList
 from sbws.lib.relaylist import RelayList
 from sbws.util.config import _get_default_config
-from sbws.util.stem import launch_tor
+from sbws.util.stem import launch_or_connect_to_tor
 
 
 class _PseudoArguments(argparse.Namespace):
@@ -91,7 +91,7 @@ SafeLogging 0
 
 @pytest.fixture(scope='session')
 def persistent_launch_tor(conf):
-cont = launch_tor(conf)
+cont = launch_or_connect_to_tor(conf)
 return cont
 
 



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

[tor-commits] [sbws/master] Merge branch 'bug_40035' into 'maint-1.1'

2021-02-19 Thread juga

commit e37c47238f3cbea71efa0ad4ef237f8e1423efd6
Merge: 713d400 17e6eca
Author: juga 
Date:   Thu Jan 7 15:51:35 2021 +

Merge branch 'bug_40035' into 'maint-1.1'

fix: doc: Update values in config_tor.rst + clean-up

Closes #40035

See merge request tpo/network-health/sbws!49

 docs/source/config_tor.rst | 13 ++---
 1 file changed, 10 insertions(+), 3 deletions(-)



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

[tor-commits] [sbws/master] fix: doc: Add forgotten image from consensus health

2021-02-19 Thread juga

commit 8805a1d2f68260a3f996e16a8938aff954af6172
Author: juga0 
Date:   Mon Jan 11 07:37:25 2021 +

fix: doc: Add forgotten image from consensus health

It was referenced by 6e6a8f3ba534cbd93b830fe3ffd5ce40abe8e77d. Since that
image was wrong, created a new screenshot from the current "past 90
days" at consensus-health.tpo.
---
 .../source/images/20210111_consensushealth_bwauths.png | Bin 0 -> 100029 bytes
 docs/source/monitoring_bandwidth.rst   |   2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/source/images/20210111_consensushealth_bwauths.png 
b/docs/source/images/20210111_consensushealth_bwauths.png
new file mode 100644
index 000..6898fd2
Binary files /dev/null and 
b/docs/source/images/20210111_consensushealth_bwauths.png differ
diff --git a/docs/source/monitoring_bandwidth.rst 
b/docs/source/monitoring_bandwidth.rst
index d9ebdf2..b3a6c65 100644
--- a/docs/source/monitoring_bandwidth.rst
+++ b/docs/source/monitoring_bandwidth.rst
@@ -15,7 +15,7 @@ Bwauths number of measured relays
 
 It should be approximately equal for all bwauths.
 
-.. image:: images/20200927_consensushealth_bwauths.png
+.. image:: images/20210111_consensushealth_bwauths.png
:alt: bwauths measured relays
 
 https://consensus-health.torproject.org/graphs.html#votedaboutgraphs



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

[tor-commits] [sbws/master] chg: stem, scanner: Change args initializing controller

2021-02-19 Thread juga

commit 80f379ac5f12078ca358d7645beee5f4278acd95
Author: juga0 
Date:   Wed Dec 16 15:39:31 2020 +

chg: stem, scanner: Change args initializing controller

to check whether the external control port configuration is set.
There is no need to assert all argument options nor to return the error.
---
 sbws/core/scanner.py |  3 +--
 sbws/util/stem.py| 30 +++---
 2 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/sbws/core/scanner.py b/sbws/core/scanner.py
index 5e6cac3..bcbeb47 100644
--- a/sbws/core/scanner.py
+++ b/sbws/core/scanner.py
@@ -679,8 +679,7 @@ def run_speedtest(args, conf):
 
 """
 global rd, pool, controller
-controller, _ = stem_utils.init_controller(
-path=conf.getpath('tor', 'control_socket'))
+controller = stem_utils.init_controller(conf)
 if not controller:
 controller = stem_utils.launch_tor(conf)
 else:
diff --git a/sbws/util/stem.py b/sbws/util/stem.py
index 746fa88..169acda 100644
--- a/sbws/util/stem.py
+++ b/sbws/util/stem.py
@@ -60,27 +60,19 @@ def remove_event_listener(controller, func):
 log.exception("Exception trying to remove event %s", e)
 
 
-def init_controller(port=None, path=None, set_custom_stream_settings=True):
-# NOTE: we do not currently support a control port even though the rest of
-# this function will pretend like port could be set.
-assert port is None
-# make sure only one is set
-assert port is not None or path is not None
-assert not (port is not None and path is not None)
-# and for the one that is set, make sure it is likely valid
-assert port is None or isinstance(port, int)
-assert path is None or isinstance(path, str)
+def init_controller(conf):
 c = None
-if port:
-c = _init_controller_port(port)
-if not c:
-return None, 'Unable to reach tor on control port'
+# If the external control port is set, use it to initialize the controller.
+control_port = conf['tor']['external_control_port']
+if control_port:
+control_port = int(control_port)
+# If it can not connect, the program will exit here
+c = _init_controller_port(control_port)
 else:
-c = _init_controller_socket(path)
-if not c:
-return None, 'Unable to reach tor on control socket'
-assert c is not None
-return c, ''
+c = _init_controller_socket(
+socket=conf.getpath('tor', 'control_socket')
+)
+return c
 
 
 def is_bootstrapped(c):



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

[tor-commits] [sbws/master] fix: stem: Exit on failure connecting to control port

2021-02-19 Thread juga

commit 6cfd60ed6272afa15458d893ffbbe2fe3703f87c
Author: juga0 
Date:   Wed Dec 16 15:21:44 2020 +

fix: stem: Exit on failure connecting to control port

because when trying to connect to an external tor (chutney), it does
not make sense to start own tor.
Also log how the connection has been made.
---
 sbws/util/stem.py | 8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/sbws/util/stem.py b/sbws/util/stem.py
index 05f8e90..d2c596f 100644
--- a/sbws/util/stem.py
+++ b/sbws/util/stem.py
@@ -110,8 +110,9 @@ def _init_controller_port(port):
 c = Controller.from_port(port=port)
 c.authenticate()
 except (IncorrectSocketType, SocketError):
-return None
+fail_hard("Unable to connect to control port %s.", port)
 # TODO: Allow for auth via more than just CookieAuthentication
+log.info("Connected to tor via port %s", port)
 return c
 
 
@@ -127,6 +128,7 @@ def _init_controller_socket(socket):
 log.exception("Error initting controller socket: %s", e)
 return None
 # TODO: Allow for auth via more than just CookieAuthentication
+log.info("Connected to tor via socket %s", socket)
 return c
 
 
@@ -233,6 +235,7 @@ def launch_tor(conf):
 torrc, init_msg_handler=log.debug, take_ownership=True)
 except Exception as e:
 fail_hard('Error trying to launch tor: %s', e)
+log.info("Started own tor.")
 # And return a controller to it
 cont = _init_controller_socket(conf.getpath('tor', 'control_socket'))
 # Set options that can fail at runtime
@@ -240,8 +243,7 @@ def launch_tor(conf):
 # Set runtime options
 set_torrc_runtime_options(cont)
 
-log.info('Started and connected to Tor %s via %s', cont.get_version(),
- conf.getpath('tor', 'control_socket'))
+log.info('Started or connected to Tor %s.', cont.get_version())
 return cont
 
 



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

[tor-commits] [sbws/master] fix: relaylist: Stop measuring relays not in the consenus

2021-02-19 Thread juga

commit a050110db59d136f6f46809c4b18fe487012e546
Author: juga0 
Date:   Mon Dec 21 16:24:50 2020 +

fix: relaylist: Stop measuring relays not in the consenus

as this might cause many circuit errors.
They're already added to the generator.
Also adapt the number in test_init_relays.

Closes: #40037.

Happy solstice! :)
---
 sbws/lib/relaylist.py| 17 +
 tests/unit/lib/test_relaylist.py |  8 
 2 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/sbws/lib/relaylist.py b/sbws/lib/relaylist.py
index 8a07ce7..640e3eb 100644
--- a/sbws/lib/relaylist.py
+++ b/sbws/lib/relaylist.py
@@ -14,7 +14,7 @@ from ..globals import (
 MAX_RECENT_PRIORITY_LIST_COUNT,
 MEASUREMENTS_PERIOD
 )
-from ..util import timestamp, timestamps
+from ..util import timestamps
 
 log = logging.getLogger(__name__)
 
@@ -250,12 +250,6 @@ class Relay:
 def relay_recent_priority_list_count(self):
 return len(self.relay_recent_priority_list)
 
-def is_old(self):
-"""Whether the last consensus seen for this relay is older than the
-measurement period.
-"""
-return timestamp.is_old(self.last_consensus_timestamp)
-
 # XXX: tech-debt: replace `_desc` attr by a a `dequee` of the last
 # descriptors seen for this relay and the timestamp.
 def update_server_descriptor(self, server_descriptor):
@@ -417,11 +411,10 @@ class RelayList:
 # already added to the new list.
 new_relays_dict.pop(fp)
 
-# If the relay is not in the current consensus but is not "old"
-# yet, add it to the new list of relays too, though its timestamp,
-# router status and descriptor can't be updated.
-elif not r.is_old():
-new_relays.append(r)
+# In #30727, the relay that is not in the current conensus but is
+# not "old", was added to the new list of relays too.
+# In #40037 we think it should not be measured, as it might cause
+# many circuit errors. It's already added to the generator.
 # Otherwise, don't add it to the new list of relays.
 # For debugging, count the old relays that will be discarded.
 else:
diff --git a/tests/unit/lib/test_relaylist.py b/tests/unit/lib/test_relaylist.py
index 31673ba..399d897 100644
--- a/tests/unit/lib/test_relaylist.py
+++ b/tests/unit/lib/test_relaylist.py
@@ -51,7 +51,7 @@ def test_init_relays(
 assert 6505 == 6433 + len(added_fps)
 # The calculated min bw for the second hop
 assert 212 == relay_list._exit_min_bw
-assert 20 == relay_list._non_exit_min_bw
+assert 21 == relay_list._non_exit_min_bw
 
 # Five days later plus 1 second.
 # The first consensus timestamp will get removed.
@@ -69,10 +69,10 @@ def test_init_relays(
 removed_fps = fps.difference(fps_5days_later)
 # The number of relays will be the number of relays in the cosensus plus
 # the added ones minus the removed ones.
-assert 6925 == 6505 + len(added_fps) - len(removed_fps)
+assert 6596 == 6505 + len(added_fps) - len(removed_fps)
 # The calculated min bw for the second hop
-assert 279 == relay_list._exit_min_bw
-assert 11 == relay_list._non_exit_min_bw
+assert 280 == relay_list._exit_min_bw
+assert 15 == relay_list._non_exit_min_bw
 
 
 def test_increment_recent_measurement_attempt(args, conf, controller):



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

[tor-commits] [sbws/master] Merge branch 'bug_40034' into 'maint-1.1'

2021-02-19 Thread juga

commit 713d40045a98a9a453a4f24a1ed3830e7fb15e6c
Merge: 187aa96 7ab6176
Author: juga 
Date:   Mon Dec 21 09:25:37 2020 +

Merge branch 'bug_40034' into 'maint-1.1'

fix: doc: Update default values in man_sbws.ini.rst

Closes #40034

See merge request tpo/network-health/sbws!46

 docs/source/man_sbws.ini.rst | 39 ++-
 1 file changed, 22 insertions(+), 17 deletions(-)



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

[tor-commits] [sbws/master] fix: doc: Update default values in man_sbws.ini.rst

2021-02-19 Thread juga

commit 7ab61765f018adf5002acce2c03773eba7eee2ae
Author: Georg Koppen 
Date:   Fri Dec 18 15:12:07 2020 +

fix: doc: Update default values in man_sbws.ini.rst

Closes #40034.
---
 docs/source/man_sbws.ini.rst | 39 ++-
 1 file changed, 22 insertions(+), 17 deletions(-)

diff --git a/docs/source/man_sbws.ini.rst b/docs/source/man_sbws.ini.rst
index 22512b8..f878ce8 100644
--- a/docs/source/man_sbws.ini.rst
+++ b/docs/source/man_sbws.ini.rst
@@ -22,12 +22,12 @@ general
   http_timeout = INT
 Timeout in seconds to give to the python Requests library. (Default: 10)
   circuit_timeout = INT
-Timeout in seconds to create circuits. (Default: 10)
+Timeout in seconds to create circuits. (Default: 60)
   reset_bw_ipv4_changes = {on, off}
 Whether or not to reset the bandwidth measurements when the relay's IP
 address changes. If it changes, we only consider results for the relay that
 we obtained while the relay was located at its most recent IP address.
-(Default: on)
+(Default: off)
   reset_bw_ipv6_changes = off
 NOT implemented for IPv6.
 
@@ -47,13 +47,13 @@ paths
 (Default: ~/.sbws/v3bw)
   v3bw_fname = STR
 File names of the bandwidth list files.
-The latest bandwidth file is symlinked by ``latests.v3bw``
-  started_filepath = STR
+The latest bandwidth file is symlinked by ``latest.v3bw``
+  state_fname = STR
 File path to store the timestamp when the scanner was last started.
-(Default: ~/.sbws/started_at)
+(Default: ~/.sbws/state.dat)
   log_dname = STR
 Directory where to store log files when logging to files is enabled.
-(Default ~/.sbws/log)
+(Default: ~/.sbws/log)
 
 destinations
 
@@ -66,7 +66,7 @@ destinations
 download files in order to measure bandwidths.
 
   usability_test_interval = INT
-How often to check if a destination is usable
+How often to check if a destination is usable (Default: 300)
 
 destinations.STR
   url = STR
@@ -112,7 +112,7 @@ scanner
   download_max = INT
 Limits on what download times are too fast/slow/etc. (Default: 10)
   num_rtts = INT
-How many RTT measurements to make. (Default: 10)
+How many RTT measurements to make. (Default: 0)
   num_downloads = INT
 Number of downloads with acceptable times we must have for a relay before
 moving on. (Default: 5)
@@ -138,15 +138,19 @@ relayprioritizer
 (Default: 50)
 
 cleanup
-  stale_days = INT
+  data_files_compress_after_days = INT
 After this many days, compress data files. (Default: 10)
-  rotten_days = INT
+  data_files_delete_after_days = INT
 After this many days, delete data files. (Default: 90)
+  v3bw_files_compress_after_days = INT
+After this many days, compress v3bw files. (Default: 1)
+  v3bw_files_delete_after_days = INT
+After this many days, delete v3bw files. (Default: 7)
 
 logging
   to_file = {yes, no}
 Whether or not to log to a rotating file the directory paths.log_dname.
-(Default: no)
+(Default: yes)
   to_stdout = {yes, no}
 Whether or not to log to stdout. (Default: yes)
   to_syslog = {yes, no}
@@ -161,23 +165,24 @@ logging
 If logging to file, how many backups to keep. If zero or max bytes is zero,
 never rotate the log file. (Default: 50)
   level = {debug, info, warning, error, critical}
-Level to log at. (Default: info)
+Level to log at. (Default: debug)
   to_file_level = {debug, info, warning, error, critical}
-Level to log at when using files. (Default: info)
+Level to log at when using files. (Default: debug)
   to_stdout_level = {debug, info, warning, error, critical}
 Level to log at when using stdout. (Default: info)
   to_syslog_level = {debug, info, warning, error, critical}
 Level to log at when using syslog. (Default: info)
   format = STR
 Format string to use when logging.
-(Default: [%(asctime)s] [%(name)s] [%(levelname)s] %(message)s)
-  to_file_format = STR
-Format string to use when logging to files. (Default: $format)
+(Default: %(asctime)s %(module)s[%(process)s]: <%(levelname)s> %(message)s)
   to_stdout_format = STR
-Format string to use when logging to stdout. (Default: $format)
+Format string to use when logging to stdout. (Default: ${format})
   to_syslog_format = STR
 Format string to use when logging to syslog.
 (Default: %(module)s[%(process)s]: <%(levelname)s> %(message)s)
+  to_file_format = STR
+Format string to use when logging to files.
+(Default: %(asctime)s %(levelname)s %(threadName)s %(filename)s:%(lineno)s 
- %(funcName)s - %(message)s)
 
 EXAMPLES
 



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

[tor-commits] [sbws/master] fix: stem: Remove unused code

2021-02-19 Thread juga

commit 553f4a8fa35a35b686c27a808671b0c1f0f76807
Author: juga0 
Date:   Wed Dec 16 15:27:55 2020 +

fix: stem: Remove unused code
---
 sbws/util/stem.py | 7 ---
 1 file changed, 7 deletions(-)

diff --git a/sbws/util/stem.py b/sbws/util/stem.py
index d2c596f..746fa88 100644
--- a/sbws/util/stem.py
+++ b/sbws/util/stem.py
@@ -80,13 +80,6 @@ def init_controller(port=None, path=None, 
set_custom_stream_settings=True):
 if not c:
 return None, 'Unable to reach tor on control socket'
 assert c is not None
-if set_custom_stream_settings:
-# These options are also set in launch_tor.
-# In a future refactor they could be set in the case they are not
-# already in the running instance. This way the controller_port
-# could also be used.
-set_torrc_options_can_fail(c)
-set_torrc_runtime_options(c)
 return c, ''
 
 



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

[tor-commits] [sbws/master] Merge branch 'bug_40033_v2' into 'maint-1.1'

2021-02-19 Thread juga

commit 187aa96c562b49591182a65365c1b6eed89f5d3c
Merge: 24180fa 3aef401
Author: juga 
Date:   Fri Dec 18 11:35:53 2020 +

Merge branch 'bug_40033_v2' into 'maint-1.1'

fix: doc: Clean up config.rst

Closes #40033

See merge request tpo/network-health/sbws!45

 docs/source/config.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)



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

[tor-commits] [sbws/master] Merge remote-tracking branch 'gitlab/merge-requests/39' into maint-1.1

2021-02-19 Thread juga

commit a66516f8b5dc90b7caa039e442c020c6a8e04d9d
Merge: 378f179 cb97fe8
Author: Georg Koppen 
Date:   Fri Dec 11 16:37:06 2020 +

Merge remote-tracking branch 'gitlab/merge-requests/39' into maint-1.1

 sbws/lib/circuitbuilder.py | 78 ++
 1 file changed, 10 insertions(+), 68 deletions(-)



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

[tor-commits] [sbws/master] fix: Bump bandwidth file version to 1.5.0

2021-02-19 Thread juga

commit 378f1792cb9e5af1c9b46088f1dc30b3ec9bc89f
Author: juga0 
Date:   Mon Dec 7 11:31:52 2020 +

fix: Bump bandwidth file version to 1.5.0

after removing KeyValue recent_measurement_attempt_count in #40023.
Changed also torspec, issue #20.

Closes: #40026.
---
 sbws/globals.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sbws/globals.py b/sbws/globals.py
index 575a19f..253e2aa 100644
--- a/sbws/globals.py
+++ b/sbws/globals.py
@@ -15,7 +15,7 @@ log = logging.getLogger(__name__)
 
 RESULT_VERSION = 4
 WIRE_VERSION = 1
-SPEC_VERSION = '1.4.0'
+SPEC_VERSION = '1.5.0'
 
 # This is a dictionary of torrc options we always want to set when launching
 # Tor and that do not depend on any runtime configuration



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

[tor-commits] [sbws/master] fix: doc: Update values in config_tor.rst + clean-up

2021-02-19 Thread juga

commit 17e6eca63645271cbf2f5553b1a71aafd3f542cd
Author: Georg Koppen 
Date:   Thu Jan 7 14:38:00 2021 +

fix: doc: Update values in config_tor.rst + clean-up

Closes #40035.
---
 docs/source/config_tor.rst | 13 ++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/docs/source/config_tor.rst b/docs/source/config_tor.rst
index 175a9ff..e609468 100644
--- a/docs/source/config_tor.rst
+++ b/docs/source/config_tor.rst
@@ -3,7 +3,7 @@
 Internal Tor configuration for the scanner
 --
 
-The scanner needs an specific Tor configuration.
+The scanner needs a specific Tor configuration.
 The following options are either set when launching Tor or required when
 connection to an existing Tor daemon.
 
@@ -16,6 +16,9 @@ Default configuration:
 - ``SafeLogging 0``: Useful for logging, since there's no need for anonymity.
 - ``LogTimeGranularity 1``
 - ``ProtocolWarnings 1``
+- ``FetchDirInfoEarly 1``
+- ``FetchDirInfoExtraEarly 1``: Respond to `MaxAdvertisedBandwidth` as soon as 
possible.
+- ``FetchUselessDescriptors 1``: Keep fetching descriptors, even when idle.
 - ``LearnCircuitBuildTimeout 0``: To keep circuit build timeouts static.
 
 Configuration that depends on the user configuration file:
@@ -29,9 +32,13 @@ Configuration that depends on the user configuration file:
 Configuration that needs to be set on runtime:
 
 - ``__DisablePredictedCircuits 1``: To build custom circuits.
-- ``__LeaveStreamsUnattached 1``
+- ``__LeaveStreamsUnattached 1``: The scanner is attaching the streams itself.
+
+Configuration that can be set on runtime and fail:
+
+- ``ConnectionPadding 0``: Useful for avoiding extra traffic, since scanner 
anonymity is not a goal.
 
 Currently most of the code that sets this configuration is in 
:func:`sbws.util.stem.launch_tor`
 and the default configuration is ``sbws/globals.py``.
 
-.. note:: the location of these code is being refactored.
\ No newline at end of file
+.. note:: the location of this code is being refactored.



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

[tor-commits] [sbws/master] chg: config: Add option to connect to external tor

2021-02-19 Thread juga

commit f6e300c83508508a6f38abe76390f9c6c3de00a2
Author: juga0 
Date:   Wed Dec 16 15:14:48 2020 +

chg: config: Add option to connect to external tor

via control port.
---
 docs/source/man_sbws.ini.rst | 4 
 sbws/config.default.ini  | 1 +
 sbws/util/config.py  | 4 +++-
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/docs/source/man_sbws.ini.rst b/docs/source/man_sbws.ini.rst
index f878ce8..e2127ab 100644
--- a/docs/source/man_sbws.ini.rst
+++ b/docs/source/man_sbws.ini.rst
@@ -93,6 +93,10 @@ tor
 sbws's owned tor pid file. (Default: ~/.sbws/tor/sbws/tor.pid)
   log = STR
 sbws's owned tor directory log files. (Default: ~/.sbws/tor/log)
+  external_control_port = INT
+tor control port to connect to. Useful to run integration tests with
+chutney.
+(Default: not set. If set, it takes preference over the control socket)
   extra_lines =
 sbws's tor extra configuration. (Default: None)
 
diff --git a/sbws/config.default.ini b/sbws/config.default.ini
index cb943d0..0105527 100644
--- a/sbws/config.default.ini
+++ b/sbws/config.default.ini
@@ -66,6 +66,7 @@ control_socket = ${tor:run_dpath}/control
 pid = ${tor:run_dpath}/tor.pid
 # note this is a directory
 log = ${tor:datadir}/log
+external_control_port =
 extra_lines =
 
 [cleanup]
diff --git a/sbws/util/config.py b/sbws/util/config.py
index e1bc429..5ba3fd5 100644
--- a/sbws/util/config.py
+++ b/sbws/util/config.py
@@ -323,7 +323,9 @@ def _validate_tor(conf):
 sec = 'tor'
 err_tmpl = Template('$sec/$key ($val): $e')
 unvalidated_keys = [
-'datadir', 'run_dpath', 'control_socket', 'pid', 'log', 'extra_lines']
+'datadir', 'run_dpath', 'control_socket', 'pid', 'log',
+'external_control_port', 'extra_lines',
+]
 all_valid_keys = unvalidated_keys
 errors.extend(_validate_section_keys(conf, sec, all_valid_keys, err_tmpl))
 return errors



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

[tor-commits] [sbws/master] Merge remote-tracking branch 'gitlab/merge-requests/41' into maint-1.1

2021-02-19 Thread juga

commit 24180fa8260466cc6f2c70fea0fc894c9f02f8d2
Merge: a66516f 033603a
Author: Georg Koppen 
Date:   Mon Dec 14 09:56:14 2020 +

Merge remote-tracking branch 'gitlab/merge-requests/41' into maint-1.1

 sbws/config.default.ini |  2 +-
 sbws/core/scanner.py| 11 +++
 sbws/lib/relaylist.py   |  5 +
 3 files changed, 17 insertions(+), 1 deletion(-)



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

[tor-commits] [sbws/master] fix: doc: Clean up config.rst

2021-02-19 Thread juga

commit 3aef4010d1139acc286a64427fa0262728939bdf
Author: Georg Koppen 
Date:   Fri Dec 18 09:12:35 2020 +

fix: doc: Clean up config.rst

Closes #40033.
---
 docs/source/config.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/source/config.rst b/docs/source/config.rst
index 328ce69..b477bef 100644
--- a/docs/source/config.rst
+++ b/docs/source/config.rst
@@ -2,7 +2,7 @@
 
 Internal code configuration files
 ==
-Sbws has two default config files it reads: on general, and one specific to
+Sbws has two default config files it reads: one general, and one specific to
 logging.
 They all get combined internally to the same ``conf`` structure.
 
@@ -44,7 +44,7 @@ Default Configuration
 
 If you know how to use
 `Python's logging configuration file format`_,
-then you can override or add to what is listed here by editing your config.ini.
+then you can override or add to what is listed here by editing your config 
file.
 
 .. literalinclude:: config.log.default.ini
 :caption: config.log.default.ini



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

[tor-commits] [sbws/master] fix: config: Increment circuit build timeout

2021-02-19 Thread juga

commit 396ccefbd5814ed00526d7385fa9562edaede1ba
Author: juga0 
Date:   Fri Dec 11 14:34:18 2020 +

fix: config: Increment circuit build timeout

setting it to the default, 60secs.
Since many relays fail to be measured cause of circuit timeout.

Maybe closes #40029.
---
 sbws/config.default.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sbws/config.default.ini b/sbws/config.default.ini
index f159b68..cb943d0 100644
--- a/sbws/config.default.ini
+++ b/sbws/config.default.ini
@@ -25,7 +25,7 @@ http_timeout = 10
 # to give to stem for waiting on a circuit to be built since
 # CircuitBuildTimeout doesn't handle the case of a TLS connection to a relay
 # taking forever, and probably other not-yet-discovered cases.
-circuit_timeout = 10
+circuit_timeout = 60
 # Whether or not to reset the bandwidth measurements when the relay's IP
 # address changes. If it changes, we only consider results for the relay that
 # we obtained while the relay was located at its most recent IP address.



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

[tor-commits] [sbws/master] fix: relaylist: Comment on IPv6 exit policy

2021-02-19 Thread juga

commit 3a4a47d302d5b23b9452a073c1b75f3daaf88608
Author: juga0 
Date:   Sun Dec 13 13:12:54 2020 +

fix: relaylist: Comment on IPv6 exit policy

that could be also checked, increasing the chances that the exit can
exit to our Web servers.
But if it could not, then we need to retry to measure it as 1st hop.
---
 sbws/lib/relaylist.py | 5 +
 1 file changed, 5 insertions(+)

diff --git a/sbws/lib/relaylist.py b/sbws/lib/relaylist.py
index dfd8b76..8a07ce7 100644
--- a/sbws/lib/relaylist.py
+++ b/sbws/lib/relaylist.py
@@ -205,6 +205,11 @@ class Relay:
 # and ips and that port. See #40006.
 # Using `strip_private` to ignore reject rules to private
 # networks.
+# We could increase the chances that the exit can exit
+# checking IPv6 with:
+# ``or self.exit_policy_v6.can_exit_to(port=443, strict=True)``
+# But if it can still not exit to our Web server, then we
+# should retry to measure it as entry.
 return (
 self.exit_policy.strip_private()
 .can_exit_to(port=port, strict=True)



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

[tor-commits] [sbws/master] fix: scanner: Retry to measure exit as exit

2021-02-19 Thread juga

commit 033603a607a8aede9ba4496b029d2545808e560e
Author: juga0 
Date:   Sun Dec 13 13:04:27 2020 +

fix: scanner: Retry to measure exit as exit

if it fails to be measured as entry.

Mayb closes: #40029.
---
 sbws/core/scanner.py | 11 +++
 1 file changed, 11 insertions(+)

diff --git a/sbws/core/scanner.py b/sbws/core/scanner.py
index 8b6a6a4..5e6cac3 100644
--- a/sbws/core/scanner.py
+++ b/sbws/core/scanner.py
@@ -318,6 +318,17 @@ def measure_relay(args, conf, destinations, cb, rl, relay):
 
 # Build the circuit
 circ_id, reason = cb.build_circuit(circ_fps)
+if not circ_id and relay.fingerprint == circ_fps[0]:
+# We detected that some exits fail to build circuits as 1st hop.
+# If that's the case, try again using them as 2nd hop.
+# We could reuse the helper, but it does not need to be an exit now,
+# so choose other again.
+helper = _pick_ideal_second_hop(
+relay, dest, rl, cb.controller, is_exit=False)
+if helper:
+circ_fps = [helper.fingerprint, relay.fingerprint]
+nicknames = [helper.nickname, relay.nickname]
+circ_id, reason = cb.build_circuit(circ_fps)
 if not circ_id:
 log.debug('Could not build circuit with path %s (%s): %s ',
   circ_fps, nicknames, reason)



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

[tor-commits] [sbws/master] chg: circuitbuilder: Remove not used attributes

2021-02-19 Thread juga

commit cb97fe8c553eec48edef32becc4acecf877d18a9
Author: juga0 
Date:   Tue Dec 8 15:48:45 2020 +

chg: circuitbuilder: Remove not used attributes

and make argument optional.
---
 sbws/lib/circuitbuilder.py | 16 ++--
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/sbws/lib/circuitbuilder.py b/sbws/lib/circuitbuilder.py
index fb23737..81742f1 100644
--- a/sbws/lib/circuitbuilder.py
+++ b/sbws/lib/circuitbuilder.py
@@ -1,7 +1,5 @@
 from stem import CircuitExtensionFailed, InvalidRequest, ProtocolError, Timeout
 from stem import InvalidArguments, ControllerError, SocketClosed
-import random
-from .relaylist import Relay
 import logging
 
 log = logging.getLogger(__name__)
@@ -25,24 +23,14 @@ class CircuitBuilder:
 them, but CircuitBuilder will keep track of existing circuits and close
 them when it is deleted.
 '''
-def __init__(self, args, conf, controller, relay_list,
+# XXX: In new major version, remove args and conf, they are not used.
+def __init__(self, args, conf, controller, relay_list=None,
  close_circuits_on_exit=True):
 self.controller = controller
-self.rng = random.SystemRandom()
-self.relay_list = relay_list
 self.built_circuits = set()
 self.close_circuits_on_exit = close_circuits_on_exit
 self.circuit_timeout = conf.getint('general', 'circuit_timeout')
 
-@property
-def relays(self):
-return self.relay_list.relays
-
-def build_circuit(self, *a, **kw):
-''' Implementations of this method should build the circuit and return
-its (str) ID. If it cannot be built, it should return None. '''
-raise NotImplementedError()
-
 def close_circuit(self, circ_id):
 try:
 self.controller.close_circuit(circ_id)



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

[tor-commits] [sbws/master] chg: scanner: Stop storing recent_measurement_attempt

2021-02-19 Thread juga

commit f014084108eafd6478fbe5e2e0afc6855435c87f
Author: juga0 
Date:   Mon Nov 23 20:02:26 2020 +

chg: scanner: Stop storing recent_measurement_attempt

because it stores a timestamp for each attempt, which makes state.dat
grow thousand of lines (json).

Closes #40023, #40020
---
 sbws/core/scanner.py | 3 ++-
 tests/integration/test_files.py  | 7 +--
 tests/unit/lib/test_heartbeat.py | 2 ++
 tests/unit/lib/test_v3bwfile.py  | 2 ++
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/sbws/core/scanner.py b/sbws/core/scanner.py
index e5d5e90..8b6a6a4 100644
--- a/sbws/core/scanner.py
+++ b/sbws/core/scanner.py
@@ -523,7 +523,8 @@ def main_loop(args, conf, controller, relay_list, 
circuit_builder, result_dump,
 # Don't start measuring a relay if sbws is stopping.
 if settings.end_event.is_set():
 break
-relay_list.increment_recent_measurement_attempt()
+# 40023, disable to decrease state.dat json lines
+# relay_list.increment_recent_measurement_attempt()
 target.increment_relay_recent_measurement_attempt()
 num_relays += 1
 # callback and callback_err must be non-blocking
diff --git a/tests/integration/test_files.py b/tests/integration/test_files.py
index aa7973d..c44340c 100644
--- a/tests/integration/test_files.py
+++ b/tests/integration/test_files.py
@@ -32,7 +32,9 @@ def test_state(conf):
 assert 1 == state.count("recent_consensus")
 assert 1 == state.count("recent_priority_list")
 assert 15 == state.count("recent_priority_relay")
-assert 15 == state.count("recent_measurement_attempt")
+# Because of 40023, it's 0. Change to 15 if we store it again at some point
+# assert 15 == state.count("recent_measurement_attempt")
+assert not state.count("recent_measurement_attempt")
 
 
 def test_v3bwfile(conf):
@@ -42,7 +44,8 @@ def test_v3bwfile(conf):
 assert "1" == bwfile.header.recent_consensus_count
 assert "1" == bwfile.header.recent_priority_list_count
 assert "15" == bwfile.header.recent_priority_relay_count
-assert "15" == bwfile.header.recent_measurement_attempt_count
+# Because of 40023, there is not this header
+# assert "15" == bwfile.header.recent_measurement_attempt_count
 for bwline in bwfile.bw_lines:
 assert 1 == bwline.relay_in_recent_consensus_count
 assert 1 == bwline.relay_recent_priority_list_count
diff --git a/tests/unit/lib/test_heartbeat.py b/tests/unit/lib/test_heartbeat.py
index b2ad634..8a2b8ea 100644
--- a/tests/unit/lib/test_heartbeat.py
+++ b/tests/unit/lib/test_heartbeat.py
@@ -1,10 +1,12 @@
 """Unit tests for heartbeat"""
 import logging
+import pytest
 
 from sbws.lib import heartbeat
 from sbws.util.state import State
 
 
+@pytest.mark.skip(reason="increment_recent_measurement_attempt() disabled")
 def test_total_measured_percent(conf, caplog):
 state = State(conf["paths"]["state_fname"])
 state["recent_priority_list"] = [1, 2, 3]
diff --git a/tests/unit/lib/test_v3bwfile.py b/tests/unit/lib/test_v3bwfile.py
index 07f59d7..d1448d1 100644
--- a/tests/unit/lib/test_v3bwfile.py
+++ b/tests/unit/lib/test_v3bwfile.py
@@ -4,6 +4,7 @@ import json
 import logging
 import math
 import os.path
+import pytest
 from unittest import mock
 
 from sbws import __version__ as version
@@ -588,6 +589,7 @@ def test_recent_consensus_count(root_data_path, datadir):
 assert "1" == header.recent_consensus_count
 
 
+@pytest.mark.skip(reason="increment_recent_measurement_attempt() disabled")
 def test_recent_measurement_attempt_count(root_data_path, datadir):
 state_fpath = os.path.join(root_data_path, '.sbws/state.dat')
 assert 15 == V3BWHeader.recent_measurement_attempt_count_from_file(



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

[tor-commits] [sbws/master] chg: circuitbuilder: Simplify building circuit

2021-02-19 Thread juga

commit b3ab8ebf9209f4e396f42e254afcca58fefc1e58
Author: juga0 
Date:   Tue Dec 8 15:43:23 2020 +

chg: circuitbuilder: Simplify building circuit

Since sbws is only building 2 hop paths, there is no need to add random
relays to the path, or convert back and forth between fingerprint and
``Relay`` objects.

This will eliminate the circuit errors:
- Tor seems to no longer think XXX is a relay
- Can not build a circuit, no path.
- Can not build a circuit with the current relays.
If a relay is not longer running when attempting to build the circuit,
it will probably fail with one of the other circuit errors: TIMEOUT,
DESTROYED or CHANNEL_CLOSED.

Closes: #40027
---
 sbws/lib/circuitbuilder.py | 62 ++
 1 file changed, 8 insertions(+), 54 deletions(-)

diff --git a/sbws/lib/circuitbuilder.py b/sbws/lib/circuitbuilder.py
index 45b807f..fb23737 100644
--- a/sbws/lib/circuitbuilder.py
+++ b/sbws/lib/circuitbuilder.py
@@ -91,62 +91,16 @@ class CircuitBuilder:
 # build the circuit, the relays are not just choosen as random as this class
 # does.
 class GapsCircuitBuilder(CircuitBuilder):
-''' The build_circuit member function takes a list. Falsey values in the
-list will be replaced with relays chosen uniformally at random; Truthy
-values will be assumed to be relays. '''
+"""Same as ``CircuitBuilder`` but implements build_circuit."""
 def __init__(self, *a, **kw):
 super().__init__(*a, **kw)
 
-def _normalize_path(self, path):
-''' Change fingerprints/nicks to relay descriptor and change Falsey
-values to None. Return the new path, or None if error '''
-new_path = []
-for fp in path:
-if not fp:
-new_path.append(None)
-continue
-relay = Relay(fp, self.controller)
-if not relay.fingerprint:
-log.debug('Tor seems to no longer think %s is a relay', fp)
-return None
-new_path.append(relay)
-return new_path
-
-def _random_sample_relays(self, number, blacklist):
-''' Get  random relays from self.relays that are not in the
-blacklist. Return None if it cannot be done because too many are
-blacklisted. Otherwise return a list of relays. '''
-all_fps = [r.fingerprint for r in self.relays]
-black_fps = [r.fingerprint for r in blacklist]
-if len(black_fps) + number > len(all_fps):
-return None
-chosen_fps = []
-while len(chosen_fps) < number:
-choice = self.rng.choice(all_fps)
-if choice in black_fps:
-continue
-chosen_fps.append(choice)
-black_fps.append(choice)
-return [Relay(fp, self.controller) for fp in chosen_fps]
-
 def build_circuit(self, path):
-'''  is a list of relays and Falsey values. Relays can be
-specified by fingerprint or nickname, and fingerprint is highly
-recommended. Falsey values (like None) will be replaced with relays
-chosen uniformally at random. A relay will not be in a circuit twice.
-'''
-if not valid_circuit_length(path):
-return None, "Can not build a circuit, invalid path."
-path = self._normalize_path(path)
-if path is None:
-return None, "Can not build a circuit, no path."
-num_missing = len(['foo' for r in path if not r])
-insert_relays = self._random_sample_relays(
-num_missing, [r for r in path if r is not None])
-if insert_relays is None:
-path = ','.join([r.nickname if r else str(None) for r in path])
-return None, "Can not build a circuit with the current relays."
-assert len(insert_relays) == num_missing
-path = [r.fingerprint if r else insert_relays.pop().fingerprint
-for r in path]
+"""Return parent class build circuit method.
+
+Since sbws is only building 2 hop paths, there is no need to add random
+relays to the path, or convert back and forth between fingerprint and
+``Relay`` objects.
+
+"""
 return self._build_circuit_impl(path)



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

[tor-commits] [sbws/master] Merge remote-tracking branch 'gitlab/merge-requests/34' into maint-1.1

2021-02-19 Thread juga

commit 8fdd85b73315a5dd72de68c8a876ca9fe823fe7d
Merge: 81d2bea f014084
Author: Georg Koppen 
Date:   Mon Nov 30 10:02:29 2020 +

Merge remote-tracking branch 'gitlab/merge-requests/34' into maint-1.1

 sbws/core/scanner.py | 3 ++-
 tests/integration/test_files.py  | 7 +--
 tests/unit/lib/test_heartbeat.py | 2 ++
 tests/unit/lib/test_v3bwfile.py  | 2 ++
 4 files changed, 11 insertions(+), 3 deletions(-)



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

[tor-commits] [sbws/master] fix: v3bwfile: Tor version added in bandwidth v1.4.0

2021-02-19 Thread juga

commit 50821110c908e5da9f1aab3b14883e39bb226614
Author: juga0 
Date:   Mon Dec 7 11:28:42 2020 +

fix: v3bwfile: Tor version added in bandwidth v1.4.0

since, by mistake, the bandwidth file version here was never updated
to v1.5.0.
This patch only changes the constants names, but logic remains the same.

Related to torspec#35.
---
 sbws/lib/v3bwfile.py | 10 +++---
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/sbws/lib/v3bwfile.py b/sbws/lib/v3bwfile.py
index 45563b6..553265b 100644
--- a/sbws/lib/v3bwfile.py
+++ b/sbws/lib/v3bwfile.py
@@ -125,13 +125,9 @@ HEADER_KEYS_V1_4 = [
 'time_to_report_half_network',
 ] + HEADER_RECENT_MEASUREMENTS_EXCLUDED_KEYS
 
-# KeyValues added in the Bandwidth File v1.5.0
-# XXX: Change SPEC_VERSION when all the v1.5.0 keys are added, before a new
-# sbws release.
 # Tor version will be obtained from the state file, so it won't be pass as an
 # argument, but will be self-initialized.
-HEADER_KEYS_V1_5_TO_INIT = ['tor_version']
-HEADER_KEYS_V1_5 = HEADER_KEYS_V1_5_TO_INIT
+HEADER_KEYS_V1_4_TO_INIT = ['tor_version']
 
 # KeyValues that are initialized from arguments, not self-initialized.
 HEADER_INIT_KEYS = (
@@ -139,7 +135,7 @@ HEADER_INIT_KEYS = (
 + HEADER_KEYS_V1_3
 + HEADER_KEYS_V1_2
 + HEADER_KEYS_V1_4
-+ HEADER_KEYS_V1_5_TO_INIT
++ HEADER_KEYS_V1_4_TO_INIT
 )
 
 HEADER_INT_KEYS = HEADER_KEYS_V1_2 + HEADER_KEYS_V1_4
@@ -150,7 +146,7 @@ HEADER_UNORDERED_KEYS = (
 + HEADER_KEYS_V1_3
 + HEADER_KEYS_V1_2
 + HEADER_KEYS_V1_4
-+ HEADER_KEYS_V1_5
++ HEADER_KEYS_V1_4_TO_INIT
 )
 # List of all the KeyValues currently being used to generate the file
 HEADER_ALL_KEYS = HEADER_KEYS_V1_1_ORDERED + HEADER_UNORDERED_KEYS



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

[tor-commits] [sbws/master] fix: doc: Move consensus weight to top

2021-02-19 Thread juga

commit 75af5c3575670121cb933135ab79ce49e7eb0f7b
Author: juga0 
Date:   Sun Sep 27 10:08:15 2020 +

fix: doc: Move consensus weight to top

and explain what to check.
---
 docs/source/monitoring_bandwidth.rst | 21 +++--
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/docs/source/monitoring_bandwidth.rst 
b/docs/source/monitoring_bandwidth.rst
index 888d544..54d1219 100644
--- a/docs/source/monitoring_bandwidth.rst
+++ b/docs/source/monitoring_bandwidth.rst
@@ -1,6 +1,17 @@
 Monitoring bandwidth changes in the Tor Network
 
 
+Total consensus weights across bandwidth authorities
+
+
+It should be approximately equal for all bwauths.
+
+.. image:: images/totalcw.png
+   :alt: total consensus weight
+
+
+âhttps://metrics.torproject.org/totalcw.html
+
 Total bandwidth
 ---
 
@@ -23,13 +34,3 @@ Should not increase.
 
 
 âhttps://metrics.torproject.org/torperf.html
-
-
-Total consensus weights across bandwidth authorities
-
-
-.. image:: images/totalcw.png
-   :alt: total consensus weight
-
-
-âhttps://metrics.torproject.org/totalcw.html



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

[tor-commits] [sbws/master] fix: doc: Add consensus health page

2021-02-19 Thread juga

commit 6e6a8f3ba534cbd93b830fe3ffd5ce40abe8e77d
Author: juga0 
Date:   Sun Sep 27 10:32:12 2020 +

fix: doc: Add consensus health page

about bwauths measured relays.
---
 docs/source/monitoring_bandwidth.rst | 12 
 1 file changed, 12 insertions(+)

diff --git a/docs/source/monitoring_bandwidth.rst 
b/docs/source/monitoring_bandwidth.rst
index 54d1219..dedf90d 100644
--- a/docs/source/monitoring_bandwidth.rst
+++ b/docs/source/monitoring_bandwidth.rst
@@ -1,6 +1,18 @@
 Monitoring bandwidth changes in the Tor Network
 
 
+Bwauths number of measured relays
+-
+
+It should be approximately equal for all bwauths.
+
+.. image:: images/20200927_consensushealth_bwauths.png
+   :alt: bwauths measured relays
+
+https://consensus-health.torproject.org/graphs.html#votedaboutgraphs
+
+http://tgnv2pssfumdedyw.onion/graphs.html#votedaboutgraphs
+
 Total consensus weights across bandwidth authorities
 
 



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

[tor-commits] [sbws/master] Merge branch 'maint-1.1' into master

2021-02-19 Thread juga

commit c8d1cc4f5d8b68688fd7dca48491531a8a9d4c30
Merge: 2e38dcb 81d2bea
Author: Georg Koppen 
Date:   Mon Oct 5 07:12:08 2020 +

Merge branch 'maint-1.1' into master

 docs/source/monitoring_bandwidth.rst | 49 
 1 file changed, 39 insertions(+), 10 deletions(-)



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

[tor-commits] [sbws/master] fix: doc: Add the bwauths timeline wiki

2021-02-19 Thread juga

commit 81d2bea0008a4ef2fc6ded2ee0bd56a6aa7cbdd7
Author: juga0 
Date:   Sun Sep 27 10:43:53 2020 +

fix: doc: Add the bwauths timeline wiki

Closes #40013.
---
 docs/source/monitoring_bandwidth.rst | 9 +
 1 file changed, 9 insertions(+)

diff --git a/docs/source/monitoring_bandwidth.rst 
b/docs/source/monitoring_bandwidth.rst
index 09326c4..d9ebdf2 100644
--- a/docs/source/monitoring_bandwidth.rst
+++ b/docs/source/monitoring_bandwidth.rst
@@ -1,6 +1,15 @@
 Monitoring bandwidth changes in the Tor Network
 
 
+Bandwidth authorities timeline
+--
+
+Events that can affect the data generated by the bwauths:
+
+https://gitlab.torproject.org/tpo/network-health/sbws/-/wikis/bandwidth%20authorities%20timeline
+
+This page might be moved to a different location.
+
 Bwauths number of measured relays
 -
 



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

[tor-commits] [sbws/master] fix: doc: Add bwauthealth tool

2021-02-19 Thread juga

commit 3ddc9f1e4648bcab2ed59059e6f6bdf29f3ce982
Author: juga0 
Date:   Sun Sep 27 10:40:58 2020 +

fix: doc: Add bwauthealth tool
---
 docs/source/monitoring_bandwidth.rst | 7 +++
 1 file changed, 7 insertions(+)

diff --git a/docs/source/monitoring_bandwidth.rst 
b/docs/source/monitoring_bandwidth.rst
index dedf90d..09326c4 100644
--- a/docs/source/monitoring_bandwidth.rst
+++ b/docs/source/monitoring_bandwidth.rst
@@ -24,6 +24,13 @@ It should be approximately equal for all bwauths.
 
 âhttps://metrics.torproject.org/totalcw.html
 
+
+Not measured relays and descriptors and consensus updates
+-
+
+Run the tool https://gitlab.torproject.org/juga/bwauthealth.
+
+
 Total bandwidth
 ---
 



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

[tor-commits] [translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal

2021-02-19 Thread translation

commit 87d1df14786caf5efa2eee5a6527e162f8aaedd3
Author: Translation commit bot 
Date:   Fri Feb 19 16:48:41 2021 +

https://gitweb.torproject.org/translation.git/commit/?h=support-portal
---
 contents+fr.po | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/contents+fr.po b/contents+fr.po
index 4e16c73632..001785e749 100644
--- a/contents+fr.po
+++ b/contents+fr.po
@@ -4894,7 +4894,7 @@ msgid ""
 "parameters) and [paper](https://www-";
 "users.cs.umn.edu/~hoppernj/single_guard.pdf) on entry guards."
 msgstr ""
-"Pour plus d'informations sur le fonctionnement des relais de garde, voir ce "
+"Pour plus de prÃ©cisions sur le fonctionnement des relais de garde, voir ce "
 "[billet de blog](https://blog.torproject.org/improving-tors-anonymity-";
 "changing-guard-parameters) et [papier](https://www-";
 "users.cs.umn.edu/~hoppernj/single_guard.pdf) sur les gardes d'entrÃ©e."
@@ -6092,10 +6092,10 @@ msgid ""
 "Browsing](https://support.mozilla.org/en-US/kb/common-myths-about-private-";
 "browsing)."
 msgstr ""
-"Pour plus d'informations concernant les limitations du mode Incognito et des"
-" onglets privÃ©s, voir l'article de Mozilla sur [Mythes courants sur la "
-"navigation privÃ©e] (https://support.mozilla.org/en-US/kb/common-myths-about-";
-"private-browsing)."
+"Pour plus de prÃ©cisions sur les limitations du mode Incognito et des onglets"
+" privÃ©s, voir l'article de Mozilla sur [Mythes courants sur la navigation "
+"privÃ©e] (https://support.mozilla.org/en-US/kb/common-myths-about-private-";
+"browsing)."
 
 #: https//support.torproject.org/tbb/tbb-editing-torrc/
 #: (content/tbb/tbb-editing-torrc/contents+en.lrquestion.title)

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

[tor-commits] [translation/communitytpo-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot

2021-02-19 Thread translation

commit 564f8a57a5438ed2726b50cc4d846fb175691918
Author: Translation commit bot 
Date:   Fri Feb 19 16:45:16 2021 +


https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot
---
 contents+fr.po | 14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/contents+fr.po b/contents+fr.po
index 957a127043..2cded00cd4 100644
--- a/contents+fr.po
+++ b/contents+fr.po
@@ -1566,8 +1566,8 @@ msgid ""
 "Please consider [helping with translations](/localization/becoming-tor-"
 "translator/) in your native language."
 msgstr ""
-"Pensez Ã  nous [aider Ã  traduire](/localization/becoming-tor-translator/) "
-"dans votre langue maternelle."
+"Envisagez de nous [aider Ã  traduire](/fr/localization/becoming-tor-"
+"translator/) dans votre langue maternelle."
 
 #: https//community.torproject.org/localization/current-status/
 #: (content/localization/current-status/contents+en.lrpage.body)
@@ -2037,9 +2037,9 @@ msgid ""
 " relays, please see this list maintained by the Tor community: "
 "[GoodBadISPs](/relay/community-resources/good-bad-isps)."
 msgstr ""
-"Pour plus dâinformation sur les hÃ©bergeur et leurs conditions 
dâautorisation"
-" des relais Tor, consultez svp la liste liste maintenue par la communautÃ© "
-"TorÂ : [GoodBadISPs](/relay/community-resources/good-bad-isps)."
+"Pour plus prÃ©cisions sur les hÃ©bergeurs et leurs politiques 
dâautorisation "
+"des relaisÂ Tor, veuille consulter cette liste tenue Ã  jour par la 
communautÃ©"
+"Â TorÂ : [GoodBadISPs](/relay/community-resources/good-bad-isps)."
 
 #: https//community.torproject.org/relay/technical-considerations/
 #: (content/relay-operations/technical-considerations/contents+en.lrpage.body)
@@ -11346,8 +11346,8 @@ msgid ""
 "manual](https://2019.www.torproject.org/docs/tor-onion-";
 "service.html.en#ClientAuthorization)."
 msgstr ""
-"Pour plus dâinformation sur lâauthentification client, consulter le 
[manuel "
-"Tor](https://2019.www.torproject.org/docs/tor-onion-";
+"Pour plus de prÃ©cisions sur lâauthentification client, veuillez consulter 
le"
+" [guide de Tor](https://2019.www.torproject.org/docs/tor-onion-";
 "service.html.en#ClientAuthorization)."
 
 #: https//community.torproject.org/onion-services/advanced/client-auth/

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

[tor-commits] [translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal

2021-02-19 Thread translation

commit 77421cced93f5cc14eb90ecb2190e6a5ac810258
Author: Translation commit bot 
Date:   Fri Feb 19 16:17:53 2021 +

https://gitweb.torproject.org/translation.git/commit/?h=support-portal
---
 contents+fr.po | 26 +-
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/contents+fr.po b/contents+fr.po
index 5f71e7aede..4e16c73632 100644
--- a/contents+fr.po
+++ b/contents+fr.po
@@ -6,7 +6,6 @@
 # Samuel JosÃ© MartÃn , 2020
 # Madeline Earp , 2020
 # Curtis Baltimore , 2020
-# AO , 2020
 # erinm, 2020
 # Emma Peel, 2020
 # Ch Re , 2020
@@ -14,6 +13,7 @@
 # a a, 2020
 # Mehdi Djazzi , 2020
 # Emeric Vallespi , 2020
+# AO , 2021
 # 
 msgid ""
 msgstr ""
@@ -21,7 +21,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-12-21 16:01+EST\n"
 "PO-Revision-Date: 2018-10-02 22:41+\n"
-"Last-Translator: Emeric Vallespi , 2020\n"
+"Last-Translator: AO , 2021\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"
@@ -1951,7 +1951,7 @@ msgstr ""
 #: https//support.torproject.org/glossary/third-party-tracking/
 #: (content/glossary/third-party-tracking/contents+en.lrword.term)
 msgid "third-party tracking"
-msgstr "pistage par des tiers"
+msgstr "suivi Ã  la trace par des tiers"
 
 #: https//support.torproject.org/glossary/third-party-tracking/
 #: (content/glossary/third-party-tracking/contents+en.lrword.definition)
@@ -2590,9 +2590,9 @@ msgid ""
 "send out your real IP address in the tracker GET request, because that's how"
 " torrents work."
 msgstr ""
-"MÃªme si votre application torrent se connecte uniquement via Tor, vous "
-"enverrez souvent votre vÃ©ritable adresse IP dans la requÃªte GET du traceur, 
"
-"car c'est ainsi que fonctionnent les torrents."
+"MÃªme si votre application BitTorrent ne se connecte que par Tor, vous "
+"enverrez souvent votre vraie adresse IP dans la requÃªte GET du traqueur, car"
+" câest ainsi que les torrents fonctionnent."
 
 #: https//support.torproject.org/faq/staying-anonymous/
 #: (content/faq/staying-anonymous/contents+en.lrquestion.description)
@@ -5039,10 +5039,9 @@ msgid ""
 "If you believe this is a Tor Browser issue, please report it on our [issue "
 "tracker](https://gitlab.torproject.org/groups/tpo/-/issues)."
 msgstr ""
-"Si vous croyez que c'est un problÃ¨me du NavigateurÂ Tor, signalez le sur "
-"notre [systÃ¨me de suivi des "
-"problÃ¨mes](https://gitlab.torproject.org/groups/tpo/-/issues) s'il vous "
-"plait."
+"Si vous croyez que problÃ¨me provient du NavigateurÂ Tor, veuillez le 
signaler"
+" sur notre [systÃ¨me de suivi des "
+"problÃ¨mes](https://gitlab.torproject.org/groups/tpo/-/issues)"
 
 #: https//support.torproject.org/tbb/tbb-25/
 #: (content/tbb/tbb-25/contents+en.lrquestion.title)
@@ -11985,8 +11984,8 @@ msgid ""
 "surveillance, or censorship."
 msgstr ""
 "TÃ©lÃ©chargez le NavigateurÂ Tor afin de dÃ©couvrir une navigation qui 
protÃ¨ge "
-"vraiment votre vie privÃ©e et vos donnÃ©es personnelles, sans pistage, ni "
-"surveillance, ni censure."
+"vraiment votre vie privÃ©e et vos donnÃ©es personnelles, sans suivi Ã  la "
+"trace, ni surveillance, ni censure."
 
 #: lego/templates/footer.html:35 templates/footer.html:35
 msgid "Our mission:"
@@ -12166,7 +12165,8 @@ msgstr "Permalien"
 msgid ""
 "Defend yourself against tracking and surveillance. Circumvent censorship."
 msgstr ""
-"DÃ©fendez-vous contre le pistage et la surveillance. Contournez la censure."
+"DÃ©fendez-vous contre le suivi Ã  la trace et la surveillance. Contournez la "
+"censure."
 
 #: templates/layout.html:14
 msgid "Tor Project | Support"

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

[tor-commits] [translation/tpo-web_completed] https://gitweb.torproject.org/translation.git/commit/?h=tpo-web_completed

2021-02-19 Thread translation

commit 92c2ba4b309c4e7aaa62f102fb103d7123e3daa8
Author: Translation commit bot 
Date:   Fri Feb 19 16:17:51 2021 +

https://gitweb.torproject.org/translation.git/commit/?h=tpo-web_completed
---
 contents+fr.po | 23 +--
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/contents+fr.po b/contents+fr.po
index 368ef5286f..924a636195 100644
--- a/contents+fr.po
+++ b/contents+fr.po
@@ -4,9 +4,9 @@
 # ducki2p , 2019
 # Curtis Baltimore , 2019
 # Emma Peel, 2019
-# AO , 2020
 # erinm, 2020
 # Gus, 2020
+# AO , 2021
 # 
 msgid ""
 msgstr ""
@@ -14,7 +14,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-02-24 13:39+CET\n"
 "PO-Revision-Date: 2019-03-09 10:41+\n"
-"Last-Translator: Gus, 2020\n"
+"Last-Translator: AO , 2021\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"
@@ -656,9 +656,9 @@ msgid ""
 "increased, but so has the prevalence of these hindrances to internet "
 "freedom."
 msgstr ""
-"La sensibilisation des gens au pistage, Ã  la surveillance et Ã  la censure a 
"
-"pu augmenter, mais ce fut aussi le cas des obstacles Ã  la libertÃ© sur "
-"Internet."
+"La sensibilisation des gens au suivi Ã  la trace, Ã  la surveillance et Ã  la 
"
+"censure a pu augmenter, mais ce fut aussi le cas des obstacles Ã  la libertÃ© 
"
+"sur Internet."
 
 #: https//www.torproject.org/about/history/
 #: (content/about/history/contents+en.lrpage.body)
@@ -806,7 +806,8 @@ msgstr "Fermer le bandeau"
 #: lego/templates/banner.html:11 templates/banner.html:11
 msgid "Tracking, surveillance, and censorship are widespread online."
 msgstr ""
-"Le pistage, la surveillance et la censure sont trÃ¨s rÃ©pandus sur Internet."
+"Le suivi Ã  la trace, la surveillance et la censure sont trÃ¨s rÃ©pandus sur "
+"Internet."
 
 #: lego/templates/banner.html:20 templates/banner.html:20
 msgid "TAKE BACK THE INTERNET WITH TOR"
@@ -834,8 +835,8 @@ msgid ""
 "surveillance, or censorship."
 msgstr ""
 "TÃ©lÃ©chargez le NavigateurÂ Tor pour dÃ©couvrir une navigation qui protÃ¨ge "
-"vraiment votre vie privÃ©e et vos donnÃ©es personnelles, sans pistage, ni "
-"surveillance, ni censure."
+"vraiment votre vie privÃ©e et vos donnÃ©es personnelles, sans suivi Ã  la "
+"trace, ni surveillance, ni censure."
 
 #: lego/templates/footer.html:35 templates/footer-min.html:9
 #: templates/footer.html:35
@@ -1145,7 +1146,8 @@ msgstr "Obtenir le NavigateurÂ Tor pour Android."
 
 #: templates/download-android.html:15 templates/hero-download.html:5
 msgid "Protect yourself against tracking, surveillance, and censorship."
-msgstr "ProtÃ©gez-vous contre le pistage, la surveillance et la censure."
+msgstr ""
+"ProtÃ©gez-vous contre le suivi Ã  la trace, la surveillance et la censure."
 
 #: templates/download-android.html:27 templates/download-android.html:30
 #: templates/download-android.html:33 templates/download-android.html:36
@@ -1366,7 +1368,8 @@ msgstr "Explorez, en toute libertÃ©."
 msgid ""
 "Defend yourself against tracking and surveillance. Circumvent censorship."
 msgstr ""
-"DÃ©fendez-vous contre le pistage et la surveillance. Contournez la censure."
+"DÃ©fendez-vous contre le suivi Ã  la trace et la surveillance. Contournez la "
+"censure."
 
 #: templates/home.html:7
 msgid "Block Trackers"

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

[tor-commits] [translation/tpo-web] https://gitweb.torproject.org/translation.git/commit/?h=tpo-web

2021-02-19 Thread translation

commit 46c14ccec3cdd071f49ea3248b672a11499a2907
Author: Translation commit bot 
Date:   Fri Feb 19 16:17:46 2021 +

https://gitweb.torproject.org/translation.git/commit/?h=tpo-web
---
 contents+fr.po | 23 +--
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/contents+fr.po b/contents+fr.po
index 368ef5286f..924a636195 100644
--- a/contents+fr.po
+++ b/contents+fr.po
@@ -4,9 +4,9 @@
 # ducki2p , 2019
 # Curtis Baltimore , 2019
 # Emma Peel, 2019
-# AO , 2020
 # erinm, 2020
 # Gus, 2020
+# AO , 2021
 # 
 msgid ""
 msgstr ""
@@ -14,7 +14,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-02-24 13:39+CET\n"
 "PO-Revision-Date: 2019-03-09 10:41+\n"
-"Last-Translator: Gus, 2020\n"
+"Last-Translator: AO , 2021\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"
@@ -656,9 +656,9 @@ msgid ""
 "increased, but so has the prevalence of these hindrances to internet "
 "freedom."
 msgstr ""
-"La sensibilisation des gens au pistage, Ã  la surveillance et Ã  la censure a 
"
-"pu augmenter, mais ce fut aussi le cas des obstacles Ã  la libertÃ© sur "
-"Internet."
+"La sensibilisation des gens au suivi Ã  la trace, Ã  la surveillance et Ã  la 
"
+"censure a pu augmenter, mais ce fut aussi le cas des obstacles Ã  la libertÃ© 
"
+"sur Internet."
 
 #: https//www.torproject.org/about/history/
 #: (content/about/history/contents+en.lrpage.body)
@@ -806,7 +806,8 @@ msgstr "Fermer le bandeau"
 #: lego/templates/banner.html:11 templates/banner.html:11
 msgid "Tracking, surveillance, and censorship are widespread online."
 msgstr ""
-"Le pistage, la surveillance et la censure sont trÃ¨s rÃ©pandus sur Internet."
+"Le suivi Ã  la trace, la surveillance et la censure sont trÃ¨s rÃ©pandus sur "
+"Internet."
 
 #: lego/templates/banner.html:20 templates/banner.html:20
 msgid "TAKE BACK THE INTERNET WITH TOR"
@@ -834,8 +835,8 @@ msgid ""
 "surveillance, or censorship."
 msgstr ""
 "TÃ©lÃ©chargez le NavigateurÂ Tor pour dÃ©couvrir une navigation qui protÃ¨ge "
-"vraiment votre vie privÃ©e et vos donnÃ©es personnelles, sans pistage, ni "
-"surveillance, ni censure."
+"vraiment votre vie privÃ©e et vos donnÃ©es personnelles, sans suivi Ã  la "
+"trace, ni surveillance, ni censure."
 
 #: lego/templates/footer.html:35 templates/footer-min.html:9
 #: templates/footer.html:35
@@ -1145,7 +1146,8 @@ msgstr "Obtenir le NavigateurÂ Tor pour Android."
 
 #: templates/download-android.html:15 templates/hero-download.html:5
 msgid "Protect yourself against tracking, surveillance, and censorship."
-msgstr "ProtÃ©gez-vous contre le pistage, la surveillance et la censure."
+msgstr ""
+"ProtÃ©gez-vous contre le suivi Ã  la trace, la surveillance et la censure."
 
 #: templates/download-android.html:27 templates/download-android.html:30
 #: templates/download-android.html:33 templates/download-android.html:36
@@ -1366,7 +1368,8 @@ msgstr "Explorez, en toute libertÃ©."
 msgid ""
 "Defend yourself against tracking and surveillance. Circumvent censorship."
 msgstr ""
-"DÃ©fendez-vous contre le pistage et la surveillance. Contournez la censure."
+"DÃ©fendez-vous contre le suivi Ã  la trace et la surveillance. Contournez la "
+"censure."
 
 #: templates/home.html:7
 msgid "Block Trackers"

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

[tor-commits] [translation/tor_outreach_md_completed] https://gitweb.torproject.org/translation.git/commit/?h=tor_outreach_md_completed

2021-02-19 Thread translation

commit 3455b9c7da10517fe45fbd5a356b1aa8923205cc
Author: Translation commit bot 
Date:   Fri Feb 19 16:17:45 2021 +


https://gitweb.torproject.org/translation.git/commit/?h=tor_outreach_md_completed
---
 tor-outreach2019-2020-fr.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tor-outreach2019-2020-fr.md b/tor-outreach2019-2020-fr.md
index 8694ac085f..c772c6f558 100644
--- a/tor-outreach2019-2020-fr.md
+++ b/tor-outreach2019-2020-fr.md
@@ -125,7 +125,7 @@ Bekele ne sait pas que la requÃªte de site Web provenait 
dâAmal, sauf si elle
 
 Dans le monde entier, des personnes utilisent Tor pour protÃ©ger leur vie 
privÃ©e et leurs renseignements personnels, mais aussi accÃ©der librement au 
Web.
 
-Tor aide Ã  protÃ©ger les journalistes, les dÃ©fenseurs des droits de la 
personne, les victimes de violence familiale, les chercheurs universitaires et 
toute personne confrontÃ©e au pistage, Ã  la censure ou Ã  la surveillance.
+Tor aide Ã  protÃ©ger les journalistes, les dÃ©fenseurs des droits de la 
personne, les victimes de violence familiale, les chercheurs universitaires et 
toute personne confrontÃ©e au suivi Ã  la trace, Ã  la censure ou Ã  la 
surveillance.
 
 ## 6. Pourquoi faire confiance Ã  Torâ?
 

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

[tor-commits] [translation/tor_outreach_md] https://gitweb.torproject.org/translation.git/commit/?h=tor_outreach_md

2021-02-19 Thread translation

commit 310d006a8f5869416d72a372fad628b230d29421
Author: Translation commit bot 
Date:   Fri Feb 19 16:17:43 2021 +

https://gitweb.torproject.org/translation.git/commit/?h=tor_outreach_md
---
 tor-outreach2019-2020-fr.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tor-outreach2019-2020-fr.md b/tor-outreach2019-2020-fr.md
index 8694ac085f..c772c6f558 100644
--- a/tor-outreach2019-2020-fr.md
+++ b/tor-outreach2019-2020-fr.md
@@ -125,7 +125,7 @@ Bekele ne sait pas que la requÃªte de site Web provenait 
dâAmal, sauf si elle
 
 Dans le monde entier, des personnes utilisent Tor pour protÃ©ger leur vie 
privÃ©e et leurs renseignements personnels, mais aussi accÃ©der librement au 
Web.
 
-Tor aide Ã  protÃ©ger les journalistes, les dÃ©fenseurs des droits de la 
personne, les victimes de violence familiale, les chercheurs universitaires et 
toute personne confrontÃ©e au pistage, Ã  la censure ou Ã  la surveillance.
+Tor aide Ã  protÃ©ger les journalistes, les dÃ©fenseurs des droits de la 
personne, les victimes de violence familiale, les chercheurs universitaires et 
toute personne confrontÃ©e au suivi Ã  la trace, Ã  la censure ou Ã  la 
surveillance.
 
 ## 6. Pourquoi faire confiance Ã  Torâ?
 

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

[tor-commits] [translation/tbmanual-contentspot_completed] https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot_completed

2021-02-19 Thread translation

commit 409e9df84f874de9be9cc91f74fd1d8404bb286b
Author: Translation commit bot 
Date:   Fri Feb 19 16:17:00 2021 +


https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot_completed
---
 contents+fr.po | 22 --
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/contents+fr.po b/contents+fr.po
index b5323c4c5b..bbdafbcb41 100644
--- a/contents+fr.po
+++ b/contents+fr.po
@@ -1209,9 +1209,9 @@ msgstr ""
 "Quand vous vous connectez Ã  un site Web, les opÃ©rateurs de ce site Web ne "
 "sont pas les seuls Ã  pouvoir enregistrer les informations concernant votre "
 "visite. La plupart des sites Web utilisent maintenant de nombreux services "
-"tiers, incluant les boutons Â«Â JâaimeÂ Â» du rÃ©seautage social, les 
systÃ¨mes de"
-" suivi analytique et les balises publicitaires qui peuvent tous associer "
-"votre activitÃ© dâun site Ã  lâautre."
+"tiers, incluant les boutons Â«Â JâaimeÂ Â» des rÃ©seaux sociaux, les 
traqueurs "
+"analytiques et les balises publicitaires qui peuvent tous associer votre "
+"activitÃ© dâun site Ã  lâautre."
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
@@ -1246,9 +1246,9 @@ msgstr ""
 "Le NavigateurÂ Tor centre votre expÃ©rience Web sur votre relation avec le "
 "site Web dans la barre dâURL. MÃªme si vous vous connectez Ã  deux sites "
 "diffÃ©rents qui utilisent le mÃªme service tiers de suivi Ã  la trace, le "
-"NavigateurÂ Tor obligera que le contenu soit servi par deux circuitsÂ Tor "
-"diffÃ©rents, et ainsi le service de pistage ne saura pas que les deux "
-"connexions proviennent de votre navigateur."
+"NavigateurÂ Tor forcera le service du contenu par deux circuitsÂ Tor "
+"diffÃ©rents, afin que le traqueur ne sache pas que les deux connexions "
+"proviennent de votre navigateur."
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
@@ -3547,7 +3547,8 @@ msgstr "Fermer le bandeau"
 #: lego/templates/banner.html:11 templates/banner.html:11
 msgid "Tracking, surveillance, and censorship are widespread online."
 msgstr ""
-"Le pistage, la surveillance et la censure sont trÃ¨s rÃ©pandus sur Internet."
+"Le suivi Ã  la trace, la surveillance et la censure sont trÃ¨s rÃ©pandus sur "
+"Internet."
 
 #: lego/templates/banner.html:20 templates/banner.html:20
 msgid "TAKE BACK THE INTERNET WITH TOR"
@@ -3574,8 +3575,8 @@ msgid ""
 "surveillance, or censorship."
 msgstr ""
 "TÃ©lÃ©chargez le NavigateurÂ Tor afin de dÃ©couvrir une navigation qui 
protÃ¨ge "
-"vraiment votre vie privÃ©e et vos donnÃ©es personnelles, sans pistage, ni "
-"surveillance, ni censure."
+"vraiment votre vie privÃ©e et vos donnÃ©es personnelles, sans suivi Ã  la "
+"trace, ni surveillance, ni censure."
 
 #: lego/templates/footer.html:35 templates/footer.html:35
 msgid "Our mission:"
@@ -3756,7 +3757,8 @@ msgstr "Si Tor est utilisÃ© ou non."
 msgid ""
 "Defend yourself against tracking and surveillance. Circumvent censorship."
 msgstr ""
-"DÃ©fendez-vous contre le pistage et la surveillance. Contournez la censure."
+"DÃ©fendez-vous contre le suivi Ã  la trace et la surveillance. Contournez la "
+"censure."
 
 #: templates/layout.html:11
 msgid "Tor Project | Tor Browser Manual"

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

[tor-commits] [translation/tbmanual-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot

2021-02-19 Thread translation

commit c7fab5daf3b2cb7de5255d5cdbf964d670bda4f8
Author: Translation commit bot 
Date:   Fri Feb 19 16:16:54 2021 +

https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot
---
 contents+fr.po | 22 --
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/contents+fr.po b/contents+fr.po
index b5323c4c5b..bbdafbcb41 100644
--- a/contents+fr.po
+++ b/contents+fr.po
@@ -1209,9 +1209,9 @@ msgstr ""
 "Quand vous vous connectez Ã  un site Web, les opÃ©rateurs de ce site Web ne "
 "sont pas les seuls Ã  pouvoir enregistrer les informations concernant votre "
 "visite. La plupart des sites Web utilisent maintenant de nombreux services "
-"tiers, incluant les boutons Â«Â JâaimeÂ Â» du rÃ©seautage social, les 
systÃ¨mes de"
-" suivi analytique et les balises publicitaires qui peuvent tous associer "
-"votre activitÃ© dâun site Ã  lâautre."
+"tiers, incluant les boutons Â«Â JâaimeÂ Â» des rÃ©seaux sociaux, les 
traqueurs "
+"analytiques et les balises publicitaires qui peuvent tous associer votre "
+"activitÃ© dâun site Ã  lâautre."
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
@@ -1246,9 +1246,9 @@ msgstr ""
 "Le NavigateurÂ Tor centre votre expÃ©rience Web sur votre relation avec le "
 "site Web dans la barre dâURL. MÃªme si vous vous connectez Ã  deux sites "
 "diffÃ©rents qui utilisent le mÃªme service tiers de suivi Ã  la trace, le "
-"NavigateurÂ Tor obligera que le contenu soit servi par deux circuitsÂ Tor "
-"diffÃ©rents, et ainsi le service de pistage ne saura pas que les deux "
-"connexions proviennent de votre navigateur."
+"NavigateurÂ Tor forcera le service du contenu par deux circuitsÂ Tor "
+"diffÃ©rents, afin que le traqueur ne sache pas que les deux connexions "
+"proviennent de votre navigateur."
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
@@ -3547,7 +3547,8 @@ msgstr "Fermer le bandeau"
 #: lego/templates/banner.html:11 templates/banner.html:11
 msgid "Tracking, surveillance, and censorship are widespread online."
 msgstr ""
-"Le pistage, la surveillance et la censure sont trÃ¨s rÃ©pandus sur Internet."
+"Le suivi Ã  la trace, la surveillance et la censure sont trÃ¨s rÃ©pandus sur "
+"Internet."
 
 #: lego/templates/banner.html:20 templates/banner.html:20
 msgid "TAKE BACK THE INTERNET WITH TOR"
@@ -3574,8 +3575,8 @@ msgid ""
 "surveillance, or censorship."
 msgstr ""
 "TÃ©lÃ©chargez le NavigateurÂ Tor afin de dÃ©couvrir une navigation qui 
protÃ¨ge "
-"vraiment votre vie privÃ©e et vos donnÃ©es personnelles, sans pistage, ni "
-"surveillance, ni censure."
+"vraiment votre vie privÃ©e et vos donnÃ©es personnelles, sans suivi Ã  la "
+"trace, ni surveillance, ni censure."
 
 #: lego/templates/footer.html:35 templates/footer.html:35
 msgid "Our mission:"
@@ -3756,7 +3757,8 @@ msgstr "Si Tor est utilisÃ© ou non."
 msgid ""
 "Defend yourself against tracking and surveillance. Circumvent censorship."
 msgstr ""
-"DÃ©fendez-vous contre le pistage et la surveillance. Contournez la censure."
+"DÃ©fendez-vous contre le suivi Ã  la trace et la surveillance. Contournez la "
+"censure."
 
 #: templates/layout.html:11
 msgid "Tor Project | Tor Browser Manual"

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

[tor-commits] [translation/communitytpo-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot

2021-02-19 Thread translation

commit a99b269447f90a798c889a17ee255267499818ee
Author: Translation commit bot 
Date:   Fri Feb 19 16:15:10 2021 +


https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot
---
 contents+fr.po | 20 +++-
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/contents+fr.po b/contents+fr.po
index 3c09fa63d6..957a127043 100644
--- a/contents+fr.po
+++ b/contents+fr.po
@@ -1485,8 +1485,9 @@ msgid ""
 "under the **Community/Translations** component."
 msgstr ""
 "* Si vous ne savez pas comment trouver la chaÃ®ne Ã  corriger, vous pouvez "
-"[ouvrir un ticket sur Bugtracker](https://support.torproject.org/misc/bug-";
-"or-feedback/), dans la partie **CommaunautÃ©/Traductions**."
+"[ouvrir un ticket sur notre systÃ¨me de suivi de "
+"bogues](https://support.torproject.org/misc/bug-or-feedback/), dans la "
+"composante **CommaunautÃ©/Traductions**."
 
 #: https//community.torproject.org/localization/translation-problem/
 #: (content/localization/translation-problem/contents+en.lrpage.body)
@@ -1592,8 +1593,8 @@ msgid ""
 
"[bugtracker](https://trac.torproject.org/projects/tor/query?status=!closed&component=Community%2FTranslations)."
 msgstr ""
 "Vous pouvez voir les tickets ouverts concernant les problÃ¨mes de traduction "
-"sur notre "
-"[bugtracker](https://trac.torproject.org/projects/tor/query?status=!closed&component=Community%2FTranslations)."
+"sur notre [systÃ¨me de suivi de "
+"bogues](https://trac.torproject.org/projects/tor/query?status=!closed&component=Community%2FTranslations)."
 
 #: https//community.torproject.org/localization/pick-a-project/
 #: (content/localization/pick-a-project/contents+en.lrpage.title)
@@ -15628,8 +15629,8 @@ msgid ""
 "surveillance, or censorship."
 msgstr ""
 "TÃ©lÃ©chargez le NavigateurÂ Tor afin de dÃ©couvrir une navigation qui 
protÃ¨ge "
-"vraiment votre vie privÃ©e et vos donnÃ©es personnelles, sans pistage, ni "
-"surveillance, ni censure."
+"vraiment votre vie privÃ©e et vos donnÃ©es personnelles, sans suivi Ã  la "
+"trace, ni surveillance, ni censure."
 
 #: lego/templates/footer.html:35 templates/footer.html:35
 msgid "Our mission:"
@@ -15815,7 +15816,8 @@ msgstr ""
 msgid ""
 "Defend yourself against tracking and surveillance. Circumvent censorship."
 msgstr ""
-"DÃ©fendez-vous contre le pistage et la surveillance. Contournez la censure."
+"DÃ©fendez-vous contre le suivi Ã  la trace et la surveillance. Contournez la "
+"censure."
 
 #: templates/onion-services.html:27
 msgid "Onionize any website"
@@ -15910,8 +15912,8 @@ msgstr ""
 msgid ""
 "Trackers are harvesting our every move, but a safer internet is possible."
 msgstr ""
-"Les traceurs collectent chacun de nos mouvements, mais un Internet plus sÃ»r "
-"est possible."
+"Les traqueurs rÃ©coltent tous vos mouvements, mais un Internet plus sÃ»r est "
+"possible."
 
 #: templates/outreach-talk.html:55
 msgid ""

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

[tor-commits] [translation/tor_outreach_md_completed] https://gitweb.torproject.org/translation.git/commit/?h=tor_outreach_md_completed

2021-02-19 Thread translation

commit 88b3c99e6ef47656cbf054bee5e559aa1a729632
Author: Translation commit bot 
Date:   Fri Feb 19 15:48:25 2021 +


https://gitweb.torproject.org/translation.git/commit/?h=tor_outreach_md_completed
---
 tor-outreach2019-2020-fr.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tor-outreach2019-2020-fr.md b/tor-outreach2019-2020-fr.md
index 4d05062205..8694ac085f 100644
--- a/tor-outreach2019-2020-fr.md
+++ b/tor-outreach2019-2020-fr.md
@@ -94,7 +94,7 @@ Avec le NavigateurÂ Tor, Jean peut naviguer en toute 
libertÃ©, en toute confiden
 
 ## Quâest-ce que Torâ?
 
-Tor est un logiciel gratuit et un rÃ©seau ouvert qui aident Ã  vous protÃ©ger 
contre le pistage, la surveillance et la censure en ligne.
+Tor est un logiciel gratuit et un rÃ©seau ouvert qui aident Ã  vous protÃ©ger 
contre le suivi Ã  la trace, la surveillance et la censure en ligne.
 Tor est crÃ©Ã© gratuitement par un organisme Ã  but non lucratifÂ 501(c)3 
situÃ© aux Ãtats-Unis appelÃ© LeÂ ProjetÂ Tor.
 
 La faÃ§on la plus simple dâutiliser Tor est avec le NavigateurÂ Tor.

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

[tor-commits] [translation/tor_outreach_md] https://gitweb.torproject.org/translation.git/commit/?h=tor_outreach_md

2021-02-19 Thread translation

commit 553364f856d67cb8cf2b71e12e7a7905ab4a7362
Author: Translation commit bot 
Date:   Fri Feb 19 15:48:23 2021 +

https://gitweb.torproject.org/translation.git/commit/?h=tor_outreach_md
---
 tor-outreach2019-2020-fr.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tor-outreach2019-2020-fr.md b/tor-outreach2019-2020-fr.md
index 4d05062205..8694ac085f 100644
--- a/tor-outreach2019-2020-fr.md
+++ b/tor-outreach2019-2020-fr.md
@@ -94,7 +94,7 @@ Avec le NavigateurÂ Tor, Jean peut naviguer en toute 
libertÃ©, en toute confiden
 
 ## Quâest-ce que Torâ?
 
-Tor est un logiciel gratuit et un rÃ©seau ouvert qui aident Ã  vous protÃ©ger 
contre le pistage, la surveillance et la censure en ligne.
+Tor est un logiciel gratuit et un rÃ©seau ouvert qui aident Ã  vous protÃ©ger 
contre le suivi Ã  la trace, la surveillance et la censure en ligne.
 Tor est crÃ©Ã© gratuitement par un organisme Ã  but non lucratifÂ 501(c)3 
situÃ© aux Ãtats-Unis appelÃ© LeÂ ProjetÂ Tor.
 
 La faÃ§on la plus simple dâutiliser Tor est avec le NavigateurÂ Tor.

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

[tor-commits] [translation/tbmanual-contentspot_completed] https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot_completed

2021-02-19 Thread translation

commit a5e28bf244c593063a934c6a04ce1ae8318891e8
Author: Translation commit bot 
Date:   Fri Feb 19 15:47:24 2021 +


https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot_completed
---
 contents+fr.po | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/contents+fr.po b/contents+fr.po
index 5dd6811396..b5323c4c5b 100644
--- a/contents+fr.po
+++ b/contents+fr.po
@@ -5,9 +5,9 @@
 # Emma Peel, 2020
 # a a, 2020
 # Antonela D , 2020
-# AO , 2020
 # erinm, 2020
 # Gus, 2020
+# AO , 2021
 # 
 msgid ""
 msgstr ""
@@ -15,7 +15,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-04-12 08:00+CET\n"
 "PO-Revision-Date: 2018-11-14 12:31+\n"
-"Last-Translator: Gus, 2020\n"
+"Last-Translator: AO , 2021\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"
@@ -1245,10 +1245,10 @@ msgid ""
 msgstr ""
 "Le NavigateurÂ Tor centre votre expÃ©rience Web sur votre relation avec le "
 "site Web dans la barre dâURL. MÃªme si vous vous connectez Ã  deux sites "
-"diffÃ©rents qui utilisent le mÃªme service tiers de pistage, le NavigateurÂ 
Tor"
-" obligera que le contenu soit servi par deux circuitsÂ Tor diffÃ©rents, et "
-"ainsi le service de pistage ne saura pas que les deux connexions proviennent"
-" de votre navigateur."
+"diffÃ©rents qui utilisent le mÃªme service tiers de suivi Ã  la trace, le "
+"NavigateurÂ Tor obligera que le contenu soit servi par deux circuitsÂ Tor "
+"diffÃ©rents, et ainsi le service de pistage ne saura pas que les deux "
+"connexions proviennent de votre navigateur."
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)

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

[tor-commits] [translation/tbmanual-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot

2021-02-19 Thread translation

commit 0cffda620aaf845fbd699cbc82b4a083839d0947
Author: Translation commit bot 
Date:   Fri Feb 19 15:47:16 2021 +

https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot
---
 contents+fr.po | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/contents+fr.po b/contents+fr.po
index 5dd6811396..b5323c4c5b 100644
--- a/contents+fr.po
+++ b/contents+fr.po
@@ -5,9 +5,9 @@
 # Emma Peel, 2020
 # a a, 2020
 # Antonela D , 2020
-# AO , 2020
 # erinm, 2020
 # Gus, 2020
+# AO , 2021
 # 
 msgid ""
 msgstr ""
@@ -15,7 +15,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-04-12 08:00+CET\n"
 "PO-Revision-Date: 2018-11-14 12:31+\n"
-"Last-Translator: Gus, 2020\n"
+"Last-Translator: AO , 2021\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"
@@ -1245,10 +1245,10 @@ msgid ""
 msgstr ""
 "Le NavigateurÂ Tor centre votre expÃ©rience Web sur votre relation avec le "
 "site Web dans la barre dâURL. MÃªme si vous vous connectez Ã  deux sites "
-"diffÃ©rents qui utilisent le mÃªme service tiers de pistage, le NavigateurÂ 
Tor"
-" obligera que le contenu soit servi par deux circuitsÂ Tor diffÃ©rents, et "
-"ainsi le service de pistage ne saura pas que les deux connexions proviennent"
-" de votre navigateur."
+"diffÃ©rents qui utilisent le mÃªme service tiers de suivi Ã  la trace, le "
+"NavigateurÂ Tor obligera que le contenu soit servi par deux circuitsÂ Tor "
+"diffÃ©rents, et ainsi le service de pistage ne saura pas que les deux "
+"connexions proviennent de votre navigateur."
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)

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

[tor-commits] [translation/donatepages-messagespot_completed] https://gitweb.torproject.org/translation.git/commit/?h=donatepages-messagespot_completed

2021-02-19 Thread translation

commit 059cb7310ca4cd5cb5419b8716ac5e20511c36c7
Author: Translation commit bot 
Date:   Fri Feb 19 15:45:16 2021 +


https://gitweb.torproject.org/translation.git/commit/?h=donatepages-messagespot_completed
---
 locale/fr/LC_MESSAGES/messages.po | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/locale/fr/LC_MESSAGES/messages.po 
b/locale/fr/LC_MESSAGES/messages.po
index 4fd4dfae69..8f41bb713a 100644
--- a/locale/fr/LC_MESSAGES/messages.po
+++ b/locale/fr/LC_MESSAGES/messages.po
@@ -4,11 +4,11 @@
 # erinm, 2018
 # Curtis Baltimore , 2019
 # Simon-Olivier Morneau , 2020
-# AO , 2020
+# AO , 2021
 # 
 msgid ""
 msgstr ""
-"Last-Translator: AO , 2020\n"
+"Last-Translator: AO , 2021\n"
 "Language-Team: French (https://www.transifex.com/otf/teams/1519/fr/)\n"
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
@@ -16,7 +16,8 @@ msgstr ""
 #: 
tmp/cache_locale/ff/ffee28cfc961a339d813aed75493753fcc9e985dfa212e1af03fc089d5c3fdb0.php:101
 msgid "Tracking, surveillance, and censorship are widespread online."
 msgstr ""
-"Le pistage, la surveillance et la censure sont trÃ¨s rÃ©pandus sur Internet."
+"Le suivi Ã  la trace, la surveillance et la censure sont trÃ¨s rÃ©pandus sur "
+"Internet."
 
 #: 
tmp/cache_locale/ff/ffee28cfc961a339d813aed75493753fcc9e985dfa212e1af03fc089d5c3fdb0.php:105
 #: 
tmp/cache_locale/dd/ddde851dcf0f4bcfdf69b2fb2bdd731c4f85ce373ca3ec850a7ca8bbc00dfb85.php:43

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

[tor-commits] [translation/donatepages-messagespot] https://gitweb.torproject.org/translation.git/commit/?h=donatepages-messagespot

2021-02-19 Thread translation

commit 243748db2eaf077b2d73310367af3e477f2c7042
Author: Translation commit bot 
Date:   Fri Feb 19 15:45:14 2021 +


https://gitweb.torproject.org/translation.git/commit/?h=donatepages-messagespot
---
 locale/fr/LC_MESSAGES/messages.po | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/locale/fr/LC_MESSAGES/messages.po 
b/locale/fr/LC_MESSAGES/messages.po
index 4fd4dfae69..8f41bb713a 100644
--- a/locale/fr/LC_MESSAGES/messages.po
+++ b/locale/fr/LC_MESSAGES/messages.po
@@ -4,11 +4,11 @@
 # erinm, 2018
 # Curtis Baltimore , 2019
 # Simon-Olivier Morneau , 2020
-# AO , 2020
+# AO , 2021
 # 
 msgid ""
 msgstr ""
-"Last-Translator: AO , 2020\n"
+"Last-Translator: AO , 2021\n"
 "Language-Team: French (https://www.transifex.com/otf/teams/1519/fr/)\n"
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
@@ -16,7 +16,8 @@ msgstr ""
 #: 
tmp/cache_locale/ff/ffee28cfc961a339d813aed75493753fcc9e985dfa212e1af03fc089d5c3fdb0.php:101
 msgid "Tracking, surveillance, and censorship are widespread online."
 msgstr ""
-"Le pistage, la surveillance et la censure sont trÃ¨s rÃ©pandus sur Internet."
+"Le suivi Ã  la trace, la surveillance et la censure sont trÃ¨s rÃ©pandus sur "
+"Internet."
 
 #: 
tmp/cache_locale/ff/ffee28cfc961a339d813aed75493753fcc9e985dfa212e1af03fc089d5c3fdb0.php:105
 #: 
tmp/cache_locale/dd/ddde851dcf0f4bcfdf69b2fb2bdd731c4f85ce373ca3ec850a7ca8bbc00dfb85.php:43

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

[tor-commits] [tor-browser-build/maint-10.0-android] Bug 40217: Update components for switch to mozilla86-based Fenix

2021-02-19 Thread sysrqb

commit 386e0ef68cefd8dc296756eea3e5d7484b692e47
Author: Georg Koppen 
Date:   Tue Feb 2 07:39:08 2021 +

Bug 40217: Update components for switch to mozilla86-based Fenix

This is the fenix part.

We need to add kotlinx-coroutines-core-1.4.2.jar manually, similar to
the 1.3.9 version (see: e06e6c1fb637eb3bad86ced029af4184f3bd750d).
---
 projects/fenix/config   |   4 +-
 projects/fenix/gradle-dependencies-list.txt | 381 +++-
 2 files changed, 205 insertions(+), 180 deletions(-)

diff --git a/projects/fenix/config b/projects/fenix/config
index c80806c..1de03ee 100644
--- a/projects/fenix/config
+++ b/projects/fenix/config
@@ -8,13 +8,13 @@ gpg_keyring: torbutton.gpg
 variant: Release
 
 var:
-  fenix_version: 85.1.0
+  fenix_version: 86.0.0b1
   torbrowser_branch: 10.0
   copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]'
   container:
 use_container: 1
   # This should be updated when the list of gradle dependencies is changed.
-  gradle_dependencies_version: 18
+  gradle_dependencies_version: 19
   # Switch to make it easier to grab all dependencies during a dry-run.
   # Note: Use the commit that integrates Tor.
   fetch_gradle_dependencies: 0
diff --git a/projects/fenix/gradle-dependencies-list.txt 
b/projects/fenix/gradle-dependencies-list.txt
index a6e60fe..5a334b3 100644
--- a/projects/fenix/gradle-dependencies-list.txt
+++ b/projects/fenix/gradle-dependencies-list.txt
@@ -706,6 +706,8 @@ 
affb7c85a3c87bdcf69ff1dbb84de11f63dc931293934bc08cd7ab18de083601 | https://jcent
 fd55a3fd6d5d8a199462dfc414749883276be93a85a1632094a1d974013041f4 | 
https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-allopen/1.4.10/kotlin-allopen-1.4.10.pom
 4c801ff4f5151778762ce2d57080f0cb10a4a94cb76ad24593cca35bff36da48 | 
https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-android-extensions-runtime/1.4.10/kotlin-android-extensions-runtime-1.4.10.jar
 f120750af0c9e0c6024c3c76469fd4638ef898fc5bc2d4c49f2fe17568f47b9e | 
https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-android-extensions-runtime/1.4.10/kotlin-android-extensions-runtime-1.4.10.pom
+baec7911227eec34845439c38876a2dd18eda7c15ac523655411e20e8f053138 | 
https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-android-extensions-runtime/1.4.21/kotlin-android-extensions-runtime-1.4.21.jar
+ec86adcccbb839d099b8649c5277a6fbe41d2c04b61b4b296584e7af52ae4ad1 | 
https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-android-extensions-runtime/1.4.21/kotlin-android-extensions-runtime-1.4.21.pom
 55b9627bceee132f70f8124b279f618ececf8d5cb8ac97c9d30f43cc5b9b3871 | 
https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-android-extensions/1.4.10/kotlin-android-extensions-1.4.10.jar
 2ae0864b6a2db8f6fea11f56dc1f3d4fdc2d1e328a876b5679e8eace58b38577 | 
https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-android-extensions/1.4.10/kotlin-android-extensions-1.4.10.pom
 0ba48754df3bcc16fafb3e22c40a251d01115359809cf14cf5f98aef15d902e1 | 
https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-annotation-processing-gradle/1.4.10/kotlin-annotation-processing-gradle-1.4.10.jar
@@ -742,6 +744,8 @@ 
a188d9367de1c4ee9479db630985c0597b20709c83161b1430d24edb27e38c40 | https://jcent
 61653ccfae8caa4203e267b479821bd90faab3fef744a7ab0fdd9f61150f970c | 
https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-reflect/1.3.72/kotlin-reflect-1.3.72.pom
 3ab3413ec945f801448360ad97bc6e14fec6d606889ede3c707cc277b4467f45 | 
https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-reflect/1.4.10/kotlin-reflect-1.4.10.jar
 eef345ac9f76f39a8f0364bfbb335619eb506c4e54e1997be1c58dc624b425d9 | 
https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-reflect/1.4.10/kotlin-reflect-1.4.10.pom
+7e1ae4f15a7aef746c5b89433f1c5e76b301a635854ef3c6b134b0ca31a36624 | 
https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-reflect/1.4.21/kotlin-reflect-1.4.21.jar
+58b1dc4a27c380f2a8008fd24d52e5597ec2668d8519d2685abcfae5ad234a70 | 
https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-reflect/1.4.21/kotlin-reflect-1.4.21.pom
 8e525c7a19a94aea294403d531fd61eed3f08b2992e313a594cb531b75ffc35d | 
https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-sam-with-receiver/1.3.72/kotlin-sam-with-receiver-1.3.72.jar
 4961812a7df6b98c49618bb67d497d5aeabf4e73ec3d346558f162f0c6d39d68 | 
https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-sam-with-receiver/1.3.72/kotlin-sam-with-receiver-1.3.72.pom
 d372f2dc8051f3d1d4fae3bd50e5fa109d3ec870c4a4830112f9afc8560aacfd | 
https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-script-runtime/1.3.72/kotlin-script-runtime-1.3.72.jar
@@ -764,45 +768,64 @@ 
d9a1cb78976db75b6173b51ad04efaebc2b3772636ad0b45cac4cd2d53222dc9 | https://jcent
 6a1ba16592546ab118186a5634c9b24589ae2ed64f0cdd41a913ffb3c2b13db6 | 
https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-scripting-jvm/1.3.72/kotlin-scripting-jvm-1.3.72.pom
 6cc266acac8dc49f5956f3f553c8de5fce0d1757c65a86b83c4ef0625a82ab69 | 
http

[tor-commits] [tor-browser-build/maint-10.0-android] Release preparation for 10.0.12

2021-02-19 Thread sysrqb

commit ba0b53801aa99485392d26f9486a24db0b08054b
Author: Matthew Finkel 
Date:   Thu Feb 18 00:47:23 2021 +

Release preparation for 10.0.12

Versions bump and Changelog update
---
 projects/android-components/config |   4 +-
 .../gradle-dependencies-list.txt   |  15 +-
 projects/fenix/config  |   4 +-
 projects/fenix/gradle-dependencies-list.txt| 356 +++--
 projects/geckoview/config  |   4 +-
 projects/openssl/config|   4 +-
 .../tor-browser/Bundle-Data/Docs/ChangeLog.txt |  17 +
 projects/tor-browser/allowed_addons.json   | 166 +-
 projects/tor-browser/config|   4 +-
 projects/tor/config|   2 +-
 rbm.conf   |   4 +-
 11 files changed, 297 insertions(+), 283 deletions(-)

diff --git a/projects/android-components/config 
b/projects/android-components/config
index 9f12767..948fcbd 100644
--- a/projects/android-components/config
+++ b/projects/android-components/config
@@ -8,12 +8,12 @@ gpg_keyring: torbutton.gpg
 variant: '[% IF c("var/release") %]Release[% ELSE %]Beta[% END %]'
 
 var:
-  android_components_version: 72.0.1
+  android_components_version: 72.0.15
   torbrowser_branch: 10.0
   container:
 use_container: 1
   # This should be updated when the list of gradle dependencies is changed.
-  gradle_dependencies_version: 17
+  gradle_dependencies_version: 19
   # Switch to make it easier to grab all dependencies during a dry-run.
   # Note: Use the commit before support for new GeckoView interfaces gets 
added.
   fetch_gradle_dependencies: 0
diff --git a/projects/android-components/gradle-dependencies-list.txt 
b/projects/android-components/gradle-dependencies-list.txt
index a23995b..b62555a 100644
--- a/projects/android-components/gradle-dependencies-list.txt
+++ b/projects/android-components/gradle-dependencies-list.txt
@@ -9,15 +9,10 @@ 
b219d2b568e7e4ba534e09f8c2fd242343df6ccbdfbbe938846f5d740e6b0b11 | https://dl.go
 6b73ff6608f4b1d6cbab620b65708a382d0b39901cf4e6b0d16f84a1b04d7732 | 
https://dl.google.com/dl/android/maven2/androidx/annotation/annotation-experimental/1.0.0/annotation-experimental-1.0.0.pom
 0baae9755f7caf52aa80cd04324b91ba93af55d4d1d17dcc9a7b53d99ef7c016 | 
https://dl.google.com/dl/android/maven2/androidx/annotation/annotation/1.0.0/annotation-1.0.0.jar
 a179c12db43d9c0300c9db63f4811db496504be5401b951d422b78490ad1e5b4 | 
https://dl.google.com/dl/android/maven2/androidx/annotation/annotation/1.0.0/annotation-1.0.0.pom
-c89d23f9804282a47992ff5ca647b784921c16caa669a7e9af34c15f81aa7442 | 
https://dl.google.com/dl/android/maven2/androidx/annotation/annotation/1.0.1/annotation-1.0.1.pom
 d38d63edb30f1467818d50aaf05f8a692dea8b31392a049bfa991b159ad5b692 | 
https://dl.google.com/dl/android/maven2/androidx/annotation/annotation/1.1.0/annotation-1.1.0.jar
 2e9372ba7780ef44952adbf86b66e1f08682c1e5277c926185f6564a13799efe | 
https://dl.google.com/dl/android/maven2/androidx/annotation/annotation/1.1.0/annotation-1.1.0.pom
-19944d32b46551a17c347e21894b95837fbd7baaafc9e2082794344f222f7361 | 
https://dl.google.com/dl/android/maven2/androidx/appcompat/appcompat-resources/1.1.0/appcompat-resources-1.1.0.aar
-046011e16cb01b6f14842565661551110ef1b6427483f5d9068493f4c49690f2 | 
https://dl.google.com/dl/android/maven2/androidx/appcompat/appcompat-resources/1.1.0/appcompat-resources-1.1.0.pom
 c470297c03ff3de1c3d15dacf0be0cae63abc10b52f021dd07ae28daa3100fe5 | 
https://dl.google.com/dl/android/maven2/androidx/appcompat/appcompat-resources/1.2.0/appcompat-resources-1.2.0.aar
 149dd8cec3664bef8ffde86c396ba1e2ab156ea68793d29800d008bacbc9c0f8 | 
https://dl.google.com/dl/android/maven2/androidx/appcompat/appcompat-resources/1.2.0/appcompat-resources-1.2.0.pom
-8d7299bca44cb3bdf17f5595766acbf459fc81fee223e8686cc6acd3a42ab5c0 | 
https://dl.google.com/dl/android/maven2/androidx/appcompat/appcompat/1.1.0/appcompat-1.1.0.aar
-340d617121f8ef8e02a6680c8f357aa3e542276d0c8a1cdcb6fd98984b2cb7b9 | 
https://dl.google.com/dl/android/maven2/androidx/appcompat/appcompat/1.1.0/appcompat-1.1.0.pom
 3d2131a55a61a777322e2126e0018011efa6339e53b44153eb651b16020cca70 | 
https://dl.google.com/dl/android/maven2/androidx/appcompat/appcompat/1.2.0/appcompat-1.2.0.aar
 8eb3cbe823b609853b481646e3d2c1aa39dbde53dd269712fd844ffdef2ebb42 | 
https://dl.google.com/dl/android/maven2/androidx/appcompat/appcompat/1.2.0/appcompat-1.2.0.pom
 4b6f1d459ddd146b4e85ed6d46e86eb8c2639c5de47904e6db4d698721334220 | 
https://dl.google.com/dl/android/maven2/androidx/arch/core/core-common/2.0.0/core-common-2.0.0.pom
@@ -54,8 +49,6 @@ 
ba6a806bc1a6faf0cbae08397b3f781feca293ff2b5f3aa600b3d2db142e5ab4 | https://dl.go
 384d529ad668ada4808de29b29a6348f0007c2841ad79cae9a5a089bd68810f5 | 
https://dl.google.com/dl/android/maven2/androidx/core/core/1.0.0/core-1.0.0.pom
 76c7cfbe596fe3c09a6983bf1c89e889

[tor-commits] [tor-browser-build/maint-10.0-android] Revert "Bug 40224: Backport Tor patch for v3 onion services"

2021-02-19 Thread sysrqb

commit 0bb4db1263193d1eef715580545d797429d9ca0b
Author: Matthew Finkel 
Date:   Wed Feb 17 18:48:49 2021 +

Revert "Bug 40224: Backport Tor patch for v3 onion services"

This reverts commit 17aa2f20efafb67b707e3827c422182c131816fe.
---
 ...1-hs-v3-Require-reasonably-live-consensus.patch | 672 -
 ...tests-Fix-unit-tests-after-merge-of-40237.patch |  97 ---
 .../0003-Pick-up-merge-conflict-resolutions.patch  |  82 ---
 projects/tor/build |   4 -
 projects/tor/config|   3 -
 5 files changed, 858 deletions(-)

diff --git a/projects/tor/0001-hs-v3-Require-reasonably-live-consensus.patch 
b/projects/tor/0001-hs-v3-Require-reasonably-live-consensus.patch
deleted file mode 100644
index 9a4ec5c..000
--- a/projects/tor/0001-hs-v3-Require-reasonably-live-consensus.patch
+++ /dev/null
@@ -1,672 +0,0 @@
-From a363b64e82bc1dac2409a65dee0606c4b66f71fc Mon Sep 17 00:00:00 2001
-From: David Goulet 
-Date: Mon, 11 Jan 2021 16:01:22 -0500
-Subject: [PATCH 1/3] hs-v3: Require reasonably live consensus
-
-Some days before this commit, the network experienced a DDoS on the directory
-authorities that prevented them to generate a consensus for more than 5 hours
-straight.
-
-That in turn entirely disabled onion service v3, client and service side, due
-to the subsystem requiring a live consensus to function properly.
-
-We know require a reasonably live consensus which means that the HSv3
-subsystem will to its job for using the best consensus tor can find. If the
-entire network is using an old consensus, than this should be alright.
-
-If the service happens to use a live consensus while a client is not, it
-should still work because the client will use the current SRV it sees which
-might be the previous SRV for the service for which it still publish
-descriptors for.
-
-If the service is using an old one and somehow can't get a new one while
-clients are on a new one, then reachability issues might arise. However, this
-is a situation we already have at the moment since the service will simply not
-work if it doesn't have a live consensus while a client has one.
-
-Fixes #40237
-
-Signed-off-by: David Goulet 
-
-diff --git a/changes/ticket40237 b/changes/ticket40237
-new file mode 100644
-index 00..fc32f59cd4
 /dev/null
-+++ b/changes/ticket40237
-@@ -0,0 +1,5 @@
-+  o Major bugfixes (onion service v3):
-+- Stop requiring a live consensus for v3 clients and services to work. The
-+  use of a reasonably live consensus will allow v3 to work properly in 
most
-+  cases if the network failed to generate a consensus for more than 2 
hours
-+  in a row. Fixes bug 40237; bugfix on 0.3.5.1-alpha.
-diff --git a/src/core/mainloop/mainloop.c b/src/core/mainloop/mainloop.c
-index e4e17f6b76..b4dbedbfe4 100644
 a/src/core/mainloop/mainloop.c
-+++ b/src/core/mainloop/mainloop.c
-@@ -2154,7 +2154,8 @@ hs_service_callback(time_t now, const or_options_t 
*options)
-   /* We need to at least be able to build circuits and that we actually have
-* a working network. */
-   if (!have_completed_a_circuit() || net_is_disabled() ||
--  networkstatus_get_live_consensus(now) == NULL) {
-+  !networkstatus_get_reasonably_live_consensus(now,
-+ usable_consensus_flavor())) {
- goto end;
-   }
- 
-diff --git a/src/feature/hs/hs_cache.c b/src/feature/hs/hs_cache.c
-index 44cd2505fd..ef5e88e947 100644
 a/src/feature/hs/hs_cache.c
-+++ b/src/feature/hs/hs_cache.c
-@@ -17,6 +17,7 @@
- #include "feature/hs/hs_common.h"
- #include "feature/hs/hs_client.h"
- #include "feature/hs/hs_descriptor.h"
-+#include "feature/nodelist/microdesc.h"
- #include "feature/nodelist/networkstatus.h"
- #include "feature/rend/rendcache.h"
- 
-@@ -739,7 +740,9 @@ cached_client_descriptor_has_expired(time_t now,
-   /* We use the current consensus time to see if we should expire this
-* descriptor since we use consensus time for all other parts of the 
protocol
-* as well (e.g. to build the blinded key and compute time periods). */
--  const networkstatus_t *ns = networkstatus_get_live_consensus(now);
-+  const networkstatus_t *ns =
-+networkstatus_get_reasonably_live_consensus(now,
-+  usable_consensus_flavor());
-   /* If we don't have a recent consensus, consider this entry expired since we
-* will want to fetch a new HS desc when we get a live consensus. */
-   if (!ns) {
-diff --git a/src/feature/hs/hs_client.c b/src/feature/hs/hs_client.c
-index fc1fd76efc..0f6109195b 100644
 a/src/feature/hs/hs_client.c
-+++ b/src/feature/hs/hs_client.c
-@@ -29,6 +29,7 @@
- #include "feature/hs/hs_descriptor.h"
- #include "feature/hs/hs_ident.h"
- #include "feature/nodelist/describe.h"
-+#include "feature/nodelist/microdesc.h"
- #include "feature/nodelist/networkstatus.h"
- #include "feature/nodelist/nodelist.h"
- #include "feature/nodelist/routerset.h"
-@@ -1302,9 +1303,10 @@

[tor-commits] [tor-browser-build/maint-10.0-android] Bug 40217: Update components for switch to mozilla86-based Fenix

2021-02-19 Thread sysrqb

commit 8d8c49377d595ca2b0f16eda4d91ae279bc9431b
Author: Georg Koppen 
Date:   Sat Jan 30 10:42:57 2021 +

Bug 40217: Update components for switch to mozilla86-based Fenix

This is the android-components part.

We need to add kotlinx-coroutines-core-1.4.2.jar manually, similar to
the 1.3.9 version (see: e06e6c1fb637eb3bad86ced029af4184f3bd750d).
---
 projects/android-components/build  |   5 +
 projects/android-components/config |   4 +-
 .../gradle-dependencies-list.txt   | 130 +++--
 3 files changed, 76 insertions(+), 63 deletions(-)

diff --git a/projects/android-components/build 
b/projects/android-components/build
index 187750f..6c62a6c 100644
--- a/projects/android-components/build
+++ b/projects/android-components/build
@@ -26,6 +26,11 @@ EOF
   cp -r $gradle_repo/dl/android/maven2/* $gradle_repo
   cp -r $gradle_repo/maven2/* $gradle_repo
   cp -r $gradle_repo/m2/* $gradle_repo
+  # Put the Kotlin/Native compiler at the right place, see:
+  # tor-browser-build#40217.
+  kotlin_dir=/home/rbm/.konan
+  mkdir $kotlin_dir
+  find $gradle_repo -type f -name kotlin-native-prebuilt-linux*tar.gz -exec 
tar -C $kotlin_dir -xaf {} \;
   tar -C $distdir -xf [% c('input_files_by_name/application-services') %]
   # XXX: We could be smarter and just copy over the projects that are needed
   # according to the Gradle dependencies list.
diff --git a/projects/android-components/config 
b/projects/android-components/config
index dd21f87..9f12767 100644
--- a/projects/android-components/config
+++ b/projects/android-components/config
@@ -8,12 +8,12 @@ gpg_keyring: torbutton.gpg
 variant: '[% IF c("var/release") %]Release[% ELSE %]Beta[% END %]'
 
 var:
-  android_components_version: 70.0.16
+  android_components_version: 72.0.1
   torbrowser_branch: 10.0
   container:
 use_container: 1
   # This should be updated when the list of gradle dependencies is changed.
-  gradle_dependencies_version: 16
+  gradle_dependencies_version: 17
   # Switch to make it easier to grab all dependencies during a dry-run.
   # Note: Use the commit before support for new GeckoView interfaces gets 
added.
   fetch_gradle_dependencies: 0
diff --git a/projects/android-components/gradle-dependencies-list.txt 
b/projects/android-components/gradle-dependencies-list.txt
index 3840e3c..a23995b 100644
--- a/projects/android-components/gradle-dependencies-list.txt
+++ b/projects/android-components/gradle-dependencies-list.txt
@@ -12,8 +12,12 @@ 
a179c12db43d9c0300c9db63f4811db496504be5401b951d422b78490ad1e5b4 | https://dl.go
 c89d23f9804282a47992ff5ca647b784921c16caa669a7e9af34c15f81aa7442 | 
https://dl.google.com/dl/android/maven2/androidx/annotation/annotation/1.0.1/annotation-1.0.1.pom
 d38d63edb30f1467818d50aaf05f8a692dea8b31392a049bfa991b159ad5b692 | 
https://dl.google.com/dl/android/maven2/androidx/annotation/annotation/1.1.0/annotation-1.1.0.jar
 2e9372ba7780ef44952adbf86b66e1f08682c1e5277c926185f6564a13799efe | 
https://dl.google.com/dl/android/maven2/androidx/annotation/annotation/1.1.0/annotation-1.1.0.pom
+19944d32b46551a17c347e21894b95837fbd7baaafc9e2082794344f222f7361 | 
https://dl.google.com/dl/android/maven2/androidx/appcompat/appcompat-resources/1.1.0/appcompat-resources-1.1.0.aar
+046011e16cb01b6f14842565661551110ef1b6427483f5d9068493f4c49690f2 | 
https://dl.google.com/dl/android/maven2/androidx/appcompat/appcompat-resources/1.1.0/appcompat-resources-1.1.0.pom
 c470297c03ff3de1c3d15dacf0be0cae63abc10b52f021dd07ae28daa3100fe5 | 
https://dl.google.com/dl/android/maven2/androidx/appcompat/appcompat-resources/1.2.0/appcompat-resources-1.2.0.aar
 149dd8cec3664bef8ffde86c396ba1e2ab156ea68793d29800d008bacbc9c0f8 | 
https://dl.google.com/dl/android/maven2/androidx/appcompat/appcompat-resources/1.2.0/appcompat-resources-1.2.0.pom
+8d7299bca44cb3bdf17f5595766acbf459fc81fee223e8686cc6acd3a42ab5c0 | 
https://dl.google.com/dl/android/maven2/androidx/appcompat/appcompat/1.1.0/appcompat-1.1.0.aar
+340d617121f8ef8e02a6680c8f357aa3e542276d0c8a1cdcb6fd98984b2cb7b9 | 
https://dl.google.com/dl/android/maven2/androidx/appcompat/appcompat/1.1.0/appcompat-1.1.0.pom
 3d2131a55a61a777322e2126e0018011efa6339e53b44153eb651b16020cca70 | 
https://dl.google.com/dl/android/maven2/androidx/appcompat/appcompat/1.2.0/appcompat-1.2.0.aar
 8eb3cbe823b609853b481646e3d2c1aa39dbde53dd269712fd844ffdef2ebb42 | 
https://dl.google.com/dl/android/maven2/androidx/appcompat/appcompat/1.2.0/appcompat-1.2.0.pom
 4b6f1d459ddd146b4e85ed6d46e86eb8c2639c5de47904e6db4d698721334220 | 
https://dl.google.com/dl/android/maven2/androidx/arch/core/core-common/2.0.0/core-common-2.0.0.pom
@@ -50,6 +54,7 @@ 
ba6a806bc1a6faf0cbae08397b3f781feca293ff2b5f3aa600b3d2db142e5ab4 | https://dl.go
 384d529ad668ada4808de29b29a6348f0007c2841ad79cae9a5a089bd68810f5 | 
https://dl.google.com/dl/android/maven2/androidx/core/core/1.0.0/core-1.0.0.pom
 76c7cfbe596fe3c09a6983bf1c89e889299c08ac9a3b52ce5182a088d056647e |

[tor-commits] [tor-browser-build/maint-10.0-android] Bug 40188: Build and ship snowflake only if it is enabled

2021-02-19 Thread sysrqb

commit 6089e1364f2c0d2a50ab1dfc8d88cc31ec27a8f0
Author: Georg Koppen 
Date:   Sat Jan 16 21:05:38 2021 +

Bug 40188: Build and ship snowflake only if it is enabled
---
 ...01-Revert-Bug-30318-Add-snowflake-support.patch | 78 ++
 projects/tor-android-service/build |  4 +-
 projects/tor-android-service/config|  2 +
 projects/tor-onion-proxy-library/build | 29 +---
 projects/tor-onion-proxy-library/config|  5 ++
 5 files changed, 108 insertions(+), 10 deletions(-)

diff --git 
a/projects/tor-android-service/0001-Revert-Bug-30318-Add-snowflake-support.patch
 
b/projects/tor-android-service/0001-Revert-Bug-30318-Add-snowflake-support.patch
new file mode 100644
index 000..b7be2ae
--- /dev/null
+++ 
b/projects/tor-android-service/0001-Revert-Bug-30318-Add-snowflake-support.patch
@@ -0,0 +1,78 @@
+From f3cf622e537a1283b821b3f3ce8e396a01bcb84b Mon Sep 17 00:00:00 2001
+From: Georg Koppen 
+Date: Sat, 16 Jan 2021 20:56:30 +
+Subject: [PATCH] Revert "Bug 30318: Add snowflake support"
+
+This reverts commit ecc251d0a73f7e2034a271efd28036a0108b8688.
+
+diff --git a/service/src/main/assets/common/bridges.txt 
b/service/src/main/assets/common/bridges.txt
+index 1525eba..fe37735 100644
+--- a/service/src/main/assets/common/bridges.txt
 b/service/src/main/assets/common/bridges.txt
+@@ -13,5 +13,3 @@ obfs4 45.145.95.6:27015 
C5B7CD6946FF10C5B3E89691A7D3F2C122D2117C cert=TD7PbUO0/0
+ obfs4 [2a0c:4d80:42:702::1]:27015 C5B7CD6946FF10C5B3E89691A7D3F2C122D2117C 
cert=TD7PbUO0/0k6xYHMPW3vJxICfkMZNdkRrb63Zhl5j9dW3iRGiCx0A7mPhe5T2EDzQ35+Zw 
iat-mode=0
+ obfs4 51.222.13.177:80 5EDAC3B810E12B01F6FD8050D2FD3E277B289A08 
cert=2uplIpLQ0q9+0qMFrK5pkaYRDOe460LL9WHBvatgkuRr/SL31wBOEupaMMJ6koRE6Ld0ew 
iat-mode=0
+ meek_lite 0.0.2.0:2 97700DFE9F483596DDA6264C4D7DF7641E1E39CE 
url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com
+-
+-snowflake 0.0.3.0:1 2B280B23E1107BB62ABFC40DDCC8824814F80A72
+diff --git 
a/service/src/main/java/org/torproject/android/service/CustomTorInstaller.java 
b/service/src/main/java/org/torproject/android/service/CustomTorInstaller.java
+index 52bc4fe..198c981 100644
+--- 
a/service/src/main/java/org/torproject/android/service/CustomTorInstaller.java
 
b/service/src/main/java/org/torproject/android/service/CustomTorInstaller.java
+@@ -40,17 +40,14 @@ public class CustomTorInstaller extends TorInstaller {
+ @Override
+ public InputStream openBridgesStream() throws IOException {
+ /*
+-BridgesList is an overloaded field, which can cause some 
confusion.
+-The list can be:
+-  1) a filter like obfs4, meek, or snowflake OR
+-  2) it can be a custom bridge
+-For (1), we just pass back all bridges, the filter will occur
+-  elsewhere in the library.
+-For (2) we return the bridge list as a raw stream.
+-If length is greater than 9, then we know this is a custom bridge
++BridgesList is an overloaded field, which can cause some 
confusion. The list can be:
++1) a filter like obfs4 or meek OR 2) it can be a custom bridge
++For (1), we just pass back all bridges, the filter will occur 
elsewhere in the library.
++For (2) we return the bridge list as a raw stream
++If length is greater than 5, then we know this is a custom bridge
+  */
+ String userDefinedBridgeList = Prefs.getBridgesList();
+-byte bridgeType = (byte) (userDefinedBridgeList.length() > 9 ? 1 : 0);
++byte bridgeType = (byte) (userDefinedBridgeList.length() > 5 ? 1 : 0);
+ // Terrible hack. Must keep in sync with 
topl::addBridgesFromResources.
+ if (bridgeType == 0) {
+ switch (userDefinedBridgeList) {
+@@ -60,9 +57,6 @@ public class CustomTorInstaller extends TorInstaller {
+ case "meek":
+ bridgeType = 3;
+ break;
+-case "snowflake":
+-bridgeType = 4;
+-break;
+ }
+ }
+ 
+diff --git 
a/service/src/main/java/org/torproject/android/service/TorService.java 
b/service/src/main/java/org/torproject/android/service/TorService.java
+index f1ddcda..32d7f30 100644
+--- a/service/src/main/java/org/torproject/android/service/TorService.java
 b/service/src/main/java/org/torproject/android/service/TorService.java
+@@ -365,12 +365,10 @@ public final class TorService extends Service implements 
TorServiceConstants, Or
+ 
+ //Check bridges to see if we need this
+ File nativeDir = new File(getApplicationInfo().nativeLibraryDir);
+-File pluggableTransportObfs = new File(nativeDir, 
"libObfs4proxy.so");
+-if(!pluggableTransportObfs.canExecute()) 
pluggableTransportObfs.setExecutable(true);
+-File pluggableTransportSnow = new File(nativeDir, 
"libSnowflak

[tor-commits] [tor-browser-build/maint-10.0-android] Bug 40217: Update components for switch to mozilla86-based Fenix

2021-02-19 Thread sysrqb

commit ca9f7bce415d1a3f0cd8715c650d07a8cab721da
Author: Georg Koppen 
Date:   Tue Jan 26 09:26:50 2021 +

Bug 40217: Update components for switch to mozilla86-based Fenix

This is the GeckoView part.
---
 projects/cbindgen/config| 6 +++---
 projects/geckoview/config   | 4 ++--
 projects/geckoview/gradle-dependencies-list.txt | 4 ++--
 projects/llvm-project/config| 4 ++--
 projects/node/config| 4 ++--
 projects/rust/config| 4 ++--
 6 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/projects/cbindgen/config b/projects/cbindgen/config
index f1e3123..a4e9cb7 100644
--- a/projects/cbindgen/config
+++ b/projects/cbindgen/config
@@ -14,9 +14,9 @@ var:
 targets:
   android:
 var:
-  cbindgen_version: 0.15.0
-  cbindgen_hash: 83b3be9f884697a51f8717af8b5498866a81e62e
-  cbindgen_vendor_hash: 
e5b843e9f51d93bc7dafdc11492fe4f5645b7a2c2aba02c473c0a81da28b961c
+  cbindgen_version: 0.16.0
+  cbindgen_hash: a00b4215a907601680f6e9acaf93df1cbafa8ded
+  cbindgen_vendor_hash: 
f470dcf6a60374f07786491fb2971e8b96f9b7ff18956eb24c4e2577e55440d6
 
 input_files:
   - project: container-image
diff --git a/projects/geckoview/config b/projects/geckoview/config
index 110cc9d..eedaa7b 100644
--- a/projects/geckoview/config
+++ b/projects/geckoview/config
@@ -8,7 +8,7 @@ git_submodule: 1
 gpg_keyring: torbutton.gpg
 
 var:
-  geckoview_version: 85.0
+  geckoview_version: 86.0b1
   torbrowser_branch: 10.0
   copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]'
   deps:
@@ -25,7 +25,7 @@ var:
   container:
 use_container: 1
   # this should be updated when the list of gradle dependencies is changed
-  gradle_dependencies_version: 5
+  gradle_dependencies_version: 6
 
 steps:
   merge_aars:
diff --git a/projects/geckoview/gradle-dependencies-list.txt 
b/projects/geckoview/gradle-dependencies-list.txt
index d9d886a..f429a3a 100644
--- a/projects/geckoview/gradle-dependencies-list.txt
+++ b/projects/geckoview/gradle-dependencies-list.txt
@@ -493,5 +493,5 @@ 
feb4ebb1ddb76dc18ee9e6028205ac226a70d40247fcccaca092303c68f8b59d | https://maven
 fdd93302c2eb94bbe6007caa28d072246d2875cda5cb774bb6299416b94d74a6 | 
https://maven.google.com/com/google/android/gms/play-services-tasks/17.0.0/play-services-tasks-17.0.0.pom
 7680e381a3c03798d999b2e441caadd8a56a0a808e108024a67af9fe26c11adc | 
https://maven.google.com/com/google/android/material/material/1.0.0/material-1.0.0.aar
 c9fff541d51c11195de305c50bbfe4d1dfc97841983d95f6d7101112603515ab | 
https://maven.google.com/com/google/android/material/material/1.0.0/material-1.0.0.pom
-33850fe43f064f95068ca0d81cb99fdb6d67af5e07f0626e433b51b9c2683aee | 
https://plugins.gradle.org/m2/org/mozilla/apilint/apilint/0.4.0/apilint-0.4.0.jar
-cf8acbecac4506eff7c2aead2f5f7c4aeb3120a57d6236f55e0e2f750fab1b55 | 
https://plugins.gradle.org/m2/org/mozilla/apilint/apilint/0.4.0/apilint-0.4.0.pom
+45ba0016b1cde3b68856888930dcb859d4f603d98051097caf98c04b795006f3 | 
https://plugins.gradle.org/m2/org/mozilla/apilint/apilint/0.4.1/apilint-0.4.1.jar
+78837a67f91cef63c005c8c6074cec05d458bd1b7fdcb930b57a0d461571c7b7 | 
https://plugins.gradle.org/m2/org/mozilla/apilint/apilint/0.4.1/apilint-0.4.1.pom
diff --git a/projects/llvm-project/config b/projects/llvm-project/config
index cf81743..822f08d 100644
--- a/projects/llvm-project/config
+++ b/projects/llvm-project/config
@@ -1,5 +1,5 @@
 # vim: filetype=yaml sw=2
-version: 11.0.0
-git_hash: 176249bd6732a8044d457092ed932768724a6f06
+version: 11.0.1
+git_hash: 43ff75f2c3feef64f9d73328230d34dac8832a9
 git_url: https://github.com/llvm/llvm-project
 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz'
diff --git a/projects/node/config b/projects/node/config
index 55f8965..87de822 100644
--- a/projects/node/config
+++ b/projects/node/config
@@ -10,8 +10,8 @@ var:
 targets:
   android:
 var:
-  node_version: 10.22.1
-  node_hash: 
f47f4725dcae137b26f8e2a7d0ab2c2c7f1f47e4f96834e6a9242f157132255f
+  node_version: 10.23.1
+  node_hash: 
88aa16f5af79615b183ca55ed81393763169e75d1fb96013cf1831895c6cedfa
 
 input_files:
   - project: container-image
diff --git a/projects/rust/config b/projects/rust/config
index 22ffd35..ba820b9 100644
--- a/projects/rust/config
+++ b/projects/rust/config
@@ -11,8 +11,8 @@ var:
 targets:
   android:
 var:
-  current_version: 1.48.0
-  previous_version: 1.47.0
+  current_version: 1.49.0
+  previous_version: 1.48.0
   arch_deps:
 - libssl-dev
 - pkg-config



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

[tor-commits] [tor-browser-build/maint-10.0-android] Bug 40214: Update AMO Collection URL

2021-02-19 Thread sysrqb

commit 73c1135363a124885bbd5e961e80c45e7d80ff77
Author: Matthew Finkel 
Date:   Tue Feb 2 05:53:51 2021 +

Bug 40214: Update AMO Collection URL
---
 tools/fetch_allowed_addons.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/fetch_allowed_addons.py b/tools/fetch_allowed_addons.py
index 065e490..ff82537 100755
--- a/tools/fetch_allowed_addons.py
+++ b/tools/fetch_allowed_addons.py
@@ -31,7 +31,7 @@ def patch_https_everywhere(addons):
 
 def main(argv):
   amo_collection = argv[0] if argv else '83a9cccfe6e24a34bd7b155ff9ee32'
-  url = 
'https://addons.mozilla.org/api/v4/accounts/account/mozilla/collections/' + 
amo_collection + '/addons/'
+  url = 
'https://services.addons.mozilla.org/api/v4/accounts/account/mozilla/collections/'
 + amo_collection + '/addons/'
   data = json.loads(fetch(url))
   fetch_and_embed_icons(data)
   patch_https_everywhere(data)



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

[tor-commits] [tor/release-0.4.5] Merge remote-tracking branch 'tor-gitlab/mr/308' into maint-0.4.5

2021-02-19 Thread asn

commit 03c686563b54bbdf1337cb047b2b6002c5a1a549
Merge: aebd0a4080 9f61d9238c
Author: George Kadianakis 
Date:   Fri Feb 19 13:26:33 2021 +0200

Merge remote-tracking branch 'tor-gitlab/mr/308' into maint-0.4.5

 changes/ticket40295| 3 +++
 src/core/mainloop/connection.c | 2 ++
 src/feature/metrics/metrics.c  | 9 +
 src/feature/metrics/metrics.h  | 1 +
 4 files changed, 15 insertions(+)



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

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

2021-02-19 Thread asn

commit 077e895934c02fd66321800fef55c9265d94889b
Merge: 2b8af39d86 03c686563b
Author: George Kadianakis 
Date:   Fri Feb 19 13:26:52 2021 +0200

Merge branch 'maint-0.4.5' into release-0.4.5

 changes/ticket40295| 3 +++
 src/core/mainloop/connection.c | 2 ++
 src/feature/metrics/metrics.c  | 9 +
 src/feature/metrics/metrics.h  | 1 +
 4 files changed, 15 insertions(+)

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

[tor-commits] [tor/release-0.4.5] metrics: Handle the connection finished flushing event

2021-02-19 Thread asn

commit 9f61d9238ce81444b988137508436255f275051d
Author: David Goulet 
Date:   Wed Feb 17 09:54:05 2021 -0500

metrics: Handle the connection finished flushing event

Turns out, we forgot to add the METRICS connection type fo the finished
flushing handler.

Fixes #40295

Signed-off-by: David Goulet 
---
 changes/ticket40295| 3 +++
 src/core/mainloop/connection.c | 2 ++
 src/feature/metrics/metrics.c  | 9 +
 src/feature/metrics/metrics.h  | 1 +
 4 files changed, 15 insertions(+)

diff --git a/changes/ticket40295 b/changes/ticket40295
new file mode 100644
index 00..e6dba80120
--- /dev/null
+++ b/changes/ticket40295
@@ -0,0 +1,3 @@
+  o Minor bugfixes (metrics port):
+- Fix a BUG() on the MetricsPort for an internal missing handler. Fixes bug
+  40295; bugfix on 0.4.5.1-alpha.
diff --git a/src/core/mainloop/connection.c b/src/core/mainloop/connection.c
index 85cdec6e1e..ada542629a 100644
--- a/src/core/mainloop/connection.c
+++ b/src/core/mainloop/connection.c
@@ -5187,6 +5187,8 @@ connection_finished_flushing(connection_t *conn)
   return connection_dir_finished_flushing(TO_DIR_CONN(conn));
 case CONN_TYPE_CONTROL:
   return connection_control_finished_flushing(TO_CONTROL_CONN(conn));
+case CONN_TYPE_METRICS:
+  return metrics_connection_finished_flushing(conn);
 default:
   log_err(LD_BUG,"got unexpected conn type %d.", conn->type);
   tor_fragile_assert();
diff --git a/src/feature/metrics/metrics.c b/src/feature/metrics/metrics.c
index 7a77ab1104..9a72fe7145 100644
--- a/src/feature/metrics/metrics.c
+++ b/src/feature/metrics/metrics.c
@@ -258,6 +258,15 @@ metrics_connection_reached_eof(connection_t *conn)
   return 0;
 }
 
+/** Called when conn has no more bytes left on its outbuf. Return 0 indicating
+ * success. */
+int
+metrics_connection_finished_flushing(connection_t *conn)
+{
+  tor_assert(conn);
+  return 0;
+}
+
 /** Initialize the subsystem. */
 void
 metrics_init(void)
diff --git a/src/feature/metrics/metrics.h b/src/feature/metrics/metrics.h
index 858722de59..e072519d10 100644
--- a/src/feature/metrics/metrics.h
+++ b/src/feature/metrics/metrics.h
@@ -28,6 +28,7 @@ buf_t *metrics_get_output(const metrics_format_t fmt);
 /* Connection. */
 int metrics_connection_process_inbuf(struct connection_t *conn);
 int metrics_connection_reached_eof(struct connection_t *conn);
+int metrics_connection_finished_flushing(struct connection_t *conn);
 
 /* Configuration. */
 int metrics_parse_ports(or_options_t *options, smartlist_t *ports,



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

[tor-commits] [tor/master] Merge branch 'maint-0.4.5'

2021-02-19 Thread asn

commit 67938e019844d8143d683321faf45d7623a3a9ae
Merge: cf1f03fe1d 03c686563b
Author: George Kadianakis 
Date:   Fri Feb 19 13:26:52 2021 +0200

Merge branch 'maint-0.4.5'

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

[tor-commits] [tor/master] Merge remote-tracking branch 'tor-gitlab/mr/308'

2021-02-19 Thread asn

commit cf1f03fe1d2a3b6e500ef1bf716976d6c2d9f192
Merge: e8cce1058c 9f61d9238c
Author: George Kadianakis 
Date:   Fri Feb 19 13:25:47 2021 +0200

Merge remote-tracking branch 'tor-gitlab/mr/308'

 changes/ticket40295| 3 +++
 src/core/mainloop/connection.c | 2 ++
 src/feature/metrics/metrics.c  | 9 +
 src/feature/metrics/metrics.h  | 1 +
 4 files changed, 15 insertions(+)




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

[tor-commits] [tor/master] Merge remote-tracking branch 'tor-gitlab/mr/308' into maint-0.4.5

2021-02-19 Thread asn

commit 03c686563b54bbdf1337cb047b2b6002c5a1a549
Merge: aebd0a4080 9f61d9238c
Author: George Kadianakis 
Date:   Fri Feb 19 13:26:33 2021 +0200

Merge remote-tracking branch 'tor-gitlab/mr/308' into maint-0.4.5

 changes/ticket40295| 3 +++
 src/core/mainloop/connection.c | 2 ++
 src/feature/metrics/metrics.c  | 9 +
 src/feature/metrics/metrics.h  | 1 +
 4 files changed, 15 insertions(+)



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

[tor-commits] [tor/master] metrics: Handle the connection finished flushing event

2021-02-19 Thread asn

commit 9f61d9238ce81444b988137508436255f275051d
Author: David Goulet 
Date:   Wed Feb 17 09:54:05 2021 -0500

metrics: Handle the connection finished flushing event

Turns out, we forgot to add the METRICS connection type fo the finished
flushing handler.

Fixes #40295

Signed-off-by: David Goulet 
---
 changes/ticket40295| 3 +++
 src/core/mainloop/connection.c | 2 ++
 src/feature/metrics/metrics.c  | 9 +
 src/feature/metrics/metrics.h  | 1 +
 4 files changed, 15 insertions(+)

diff --git a/changes/ticket40295 b/changes/ticket40295
new file mode 100644
index 00..e6dba80120
--- /dev/null
+++ b/changes/ticket40295
@@ -0,0 +1,3 @@
+  o Minor bugfixes (metrics port):
+- Fix a BUG() on the MetricsPort for an internal missing handler. Fixes bug
+  40295; bugfix on 0.4.5.1-alpha.
diff --git a/src/core/mainloop/connection.c b/src/core/mainloop/connection.c
index 85cdec6e1e..ada542629a 100644
--- a/src/core/mainloop/connection.c
+++ b/src/core/mainloop/connection.c
@@ -5187,6 +5187,8 @@ connection_finished_flushing(connection_t *conn)
   return connection_dir_finished_flushing(TO_DIR_CONN(conn));
 case CONN_TYPE_CONTROL:
   return connection_control_finished_flushing(TO_CONTROL_CONN(conn));
+case CONN_TYPE_METRICS:
+  return metrics_connection_finished_flushing(conn);
 default:
   log_err(LD_BUG,"got unexpected conn type %d.", conn->type);
   tor_fragile_assert();
diff --git a/src/feature/metrics/metrics.c b/src/feature/metrics/metrics.c
index 7a77ab1104..9a72fe7145 100644
--- a/src/feature/metrics/metrics.c
+++ b/src/feature/metrics/metrics.c
@@ -258,6 +258,15 @@ metrics_connection_reached_eof(connection_t *conn)
   return 0;
 }
 
+/** Called when conn has no more bytes left on its outbuf. Return 0 indicating
+ * success. */
+int
+metrics_connection_finished_flushing(connection_t *conn)
+{
+  tor_assert(conn);
+  return 0;
+}
+
 /** Initialize the subsystem. */
 void
 metrics_init(void)
diff --git a/src/feature/metrics/metrics.h b/src/feature/metrics/metrics.h
index 858722de59..e072519d10 100644
--- a/src/feature/metrics/metrics.h
+++ b/src/feature/metrics/metrics.h
@@ -28,6 +28,7 @@ buf_t *metrics_get_output(const metrics_format_t fmt);
 /* Connection. */
 int metrics_connection_process_inbuf(struct connection_t *conn);
 int metrics_connection_reached_eof(struct connection_t *conn);
+int metrics_connection_finished_flushing(struct connection_t *conn);
 
 /* Configuration. */
 int metrics_parse_ports(or_options_t *options, smartlist_t *ports,



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

[tor-commits] [tor/maint-0.4.5] Merge remote-tracking branch 'tor-gitlab/mr/308' into maint-0.4.5

2021-02-19 Thread asn

commit 03c686563b54bbdf1337cb047b2b6002c5a1a549
Merge: aebd0a4080 9f61d9238c
Author: George Kadianakis 
Date:   Fri Feb 19 13:26:33 2021 +0200

Merge remote-tracking branch 'tor-gitlab/mr/308' into maint-0.4.5

 changes/ticket40295| 3 +++
 src/core/mainloop/connection.c | 2 ++
 src/feature/metrics/metrics.c  | 9 +
 src/feature/metrics/metrics.h  | 1 +
 4 files changed, 15 insertions(+)

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

[tor-commits] [tor/maint-0.4.5] metrics: Handle the connection finished flushing event

2021-02-19 Thread asn

commit 9f61d9238ce81444b988137508436255f275051d
Author: David Goulet 
Date:   Wed Feb 17 09:54:05 2021 -0500

metrics: Handle the connection finished flushing event

Turns out, we forgot to add the METRICS connection type fo the finished
flushing handler.

Fixes #40295

Signed-off-by: David Goulet 
---
 changes/ticket40295| 3 +++
 src/core/mainloop/connection.c | 2 ++
 src/feature/metrics/metrics.c  | 9 +
 src/feature/metrics/metrics.h  | 1 +
 4 files changed, 15 insertions(+)

diff --git a/changes/ticket40295 b/changes/ticket40295
new file mode 100644
index 00..e6dba80120
--- /dev/null
+++ b/changes/ticket40295
@@ -0,0 +1,3 @@
+  o Minor bugfixes (metrics port):
+- Fix a BUG() on the MetricsPort for an internal missing handler. Fixes bug
+  40295; bugfix on 0.4.5.1-alpha.
diff --git a/src/core/mainloop/connection.c b/src/core/mainloop/connection.c
index 85cdec6e1e..ada542629a 100644
--- a/src/core/mainloop/connection.c
+++ b/src/core/mainloop/connection.c
@@ -5187,6 +5187,8 @@ connection_finished_flushing(connection_t *conn)
   return connection_dir_finished_flushing(TO_DIR_CONN(conn));
 case CONN_TYPE_CONTROL:
   return connection_control_finished_flushing(TO_CONTROL_CONN(conn));
+case CONN_TYPE_METRICS:
+  return metrics_connection_finished_flushing(conn);
 default:
   log_err(LD_BUG,"got unexpected conn type %d.", conn->type);
   tor_fragile_assert();
diff --git a/src/feature/metrics/metrics.c b/src/feature/metrics/metrics.c
index 7a77ab1104..9a72fe7145 100644
--- a/src/feature/metrics/metrics.c
+++ b/src/feature/metrics/metrics.c
@@ -258,6 +258,15 @@ metrics_connection_reached_eof(connection_t *conn)
   return 0;
 }
 
+/** Called when conn has no more bytes left on its outbuf. Return 0 indicating
+ * success. */
+int
+metrics_connection_finished_flushing(connection_t *conn)
+{
+  tor_assert(conn);
+  return 0;
+}
+
 /** Initialize the subsystem. */
 void
 metrics_init(void)
diff --git a/src/feature/metrics/metrics.h b/src/feature/metrics/metrics.h
index 858722de59..e072519d10 100644
--- a/src/feature/metrics/metrics.h
+++ b/src/feature/metrics/metrics.h
@@ -28,6 +28,7 @@ buf_t *metrics_get_output(const metrics_format_t fmt);
 /* Connection. */
 int metrics_connection_process_inbuf(struct connection_t *conn);
 int metrics_connection_reached_eof(struct connection_t *conn);
+int metrics_connection_finished_flushing(struct connection_t *conn);
 
 /* Configuration. */
 int metrics_parse_ports(or_options_t *options, smartlist_t *ports,



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

[tor-commits] [tor/master] Merge remote-tracking branch 'tor-gitlab/mr/305'

2021-02-19 Thread asn

commit e8cce1058c06e8f1bec486c9e49bc2e81243b672
Merge: b2f025cb56 7f32ae0eb5
Author: George Kadianakis 
Date:   Fri Feb 19 13:24:34 2021 +0200

Merge remote-tracking branch 'tor-gitlab/mr/305'

 .gitlab/issue_templates/Bug.md | 32 
 .gitlab/issue_templates/Feature.md |  9 +
 2 files changed, 41 insertions(+)

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

[tor-commits] [tor/master] Use titlecase for template filenames.

2021-02-19 Thread asn

commit 22df6a3127fe4f55217186be068048905a24d14d
Author: Alexander FÃ¦rÃ¸y 
Date:   Fri Feb 12 20:39:28 2021 +

Use titlecase for template filenames.
---
 .gitlab/issue_templates/{bug.md => Bug.md}   | 0
 .gitlab/issue_templates/{feature.md => Feature.md}   | 0
 .gitlab/issue_templates/{proposal.md => Proposal.md} | 0
 3 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/.gitlab/issue_templates/bug.md b/.gitlab/issue_templates/Bug.md
similarity index 100%
rename from .gitlab/issue_templates/bug.md
rename to .gitlab/issue_templates/Bug.md
diff --git a/.gitlab/issue_templates/feature.md 
b/.gitlab/issue_templates/Feature.md
similarity index 100%
rename from .gitlab/issue_templates/feature.md
rename to .gitlab/issue_templates/Feature.md
diff --git a/.gitlab/issue_templates/proposal.md 
b/.gitlab/issue_templates/Proposal.md
similarity index 100%
rename from .gitlab/issue_templates/proposal.md
rename to .gitlab/issue_templates/Proposal.md



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

[tor-commits] [tor/master] Remove Proposal.md.

2021-02-19 Thread asn

commit 7f32ae0eb55382b9ef59a36713887b7a8927b794
Author: Alexander FÃ¦rÃ¸y 
Date:   Fri Feb 12 20:39:48 2021 +

Remove Proposal.md.

I don't think the Proposal.md fits well with the kind of tickets we see.
Let's start with Features and Bug and expand upon it as we go.
---
 .gitlab/issue_templates/Proposal.md | 5 -
 1 file changed, 5 deletions(-)

diff --git a/.gitlab/issue_templates/Proposal.md 
b/.gitlab/issue_templates/Proposal.md
deleted file mode 100644
index 990ca70a0a..00
--- a/.gitlab/issue_templates/Proposal.md
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-### Proposal
-
-



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

1 2 >

1 - 100 of 116 matches

Mail list logo