date:20200318

[tor-commits] [tor/master] fix typo in comment

2020-03-18 Thread arma

commit 987247bd76f1ca1ccffdee6348d240c876f78dfb
Author: Roger Dingledine 
Date:   Thu Mar 19 00:41:57 2020 -0400

fix typo in comment
---
 src/feature/hs/hs_cell.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/feature/hs/hs_cell.c b/src/feature/hs/hs_cell.c
index dd5fefd7e..fc9f4a265 100644
--- a/src/feature/hs/hs_cell.c
+++ b/src/feature/hs/hs_cell.c
@@ -758,7 +758,7 @@ hs_cell_parse_intro_established(const uint8_t *payload, 
size_t payload_len)
  * INTRO2 MAC to ensure that the keys are the right ones.
  *
  * Return NULL on failure to either produce the key material or on MAC
- * valication. Else a newly allocated intro keys object. */
+ * validation. Else return a newly allocated intro keys object. */
 static hs_ntor_intro_cell_keys_t *
 get_introduce2_keys_and_verify_mac(hs_cell_introduce2_data_t *data,
const uint8_t *encrypted_section,

___
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

2020-03-18 Thread translation

commit c87ce4d71a13019ca6aa70e4ecacc88678e71e31
Author: Translation commit bot 
Date:   Thu Mar 19 00:45:35 2020 +


https://gitweb.torproject.org/translation.git/commit/?h=donatepages-messagespot
---
 locale/es/LC_MESSAGES/messages.po | 40 ---
 1 file changed, 21 insertions(+), 19 deletions(-)

diff --git a/locale/es/LC_MESSAGES/messages.po 
b/locale/es/LC_MESSAGES/messages.po
index 7b9b2ab232..726eaf8026 100644
--- a/locale/es/LC_MESSAGES/messages.po
+++ b/locale/es/LC_MESSAGES/messages.po
@@ -10,14 +10,14 @@
 # erinm, 2019
 # eulalio barbero espinosa , 2019
 # Zuhualime Akoochimoya, 2019
-# JoaquÃn Serna , 2019
 # Emma Peel, 2020
 # Bry, 2020
 # David Figuera , 2020
+# JoaquÃn Serna , 2020
 # 
 msgid ""
 msgstr ""
-"Last-Translator: David Figuera , 2020\n"
+"Last-Translator: JoaquÃn Serna , 2020\n"
 "Language-Team: Spanish (https://www.transifex.com/otf/teams/1519/es/)\n"
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -1130,7 +1130,7 @@ msgid ""
 "Please make your monthly donation now and stand with the Tor Project at this"
 " critical time."
 msgstr ""
-"Por favor haz ahora su donaciÃ³n mensual y apoya a Tor Project en estos "
+"Por favor haga ahora su donaciÃ³n mensual y apoya a Tor Project en estos "
 "crÃticos momentos. "
 
 #: 
tmp/cache_locale/94/94c6c1969d2fadbd23c135ac864b97902daca8f5c816b03864ea5c4970a167cf.php:109
@@ -1232,15 +1232,16 @@ msgid ""
 "links\" href=\"https://2019.www.torproject.org/donate/donate.html.en\; "
 "target=\"_blank\">credit card or PayPal, please click here."
 msgstr ""
-"Nota: Si quieres donar al Proyecto Tor por tarjeta de credito o PayPal, haz "
-"clic aqui."
+"Nota: Si quieres donar al Tor Project con https://2019.www.torproject.org/donate/donate.html.es\; "
+"target=\"_blank\">tarjeta de credito o PayPal, haz clic aqui."
 
 #: 
tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:95
 msgid ""
 "The Tor Project also offers the following alternative donation methods:"
 msgstr ""
-"El Proyecto Tor tambien ofrece los siguientes mÃ©thodos alternativos para "
-"donar: "
+"El Tor Porject tambien ofrece los siguientes mÃ©todos de donaciÃ³n "
+"alternativos:"
 
 #: 
tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:102
 msgid "Bitcoin and Other Cryptocurrencies"
@@ -1284,7 +1285,8 @@ msgid ""
 msgstr ""
 "Si tiene cualquier pregunta o le gustarÃa recibir un regalo de "
 "agradecimiento despues de hacer una donaciÃ³n con uno de los mÃ©todos arriba, 
"
-"por favor envÃenos un correo electrÃ³nico a giving(at)torproject.org."
+"por favor envÃenos un correo electrÃ³nico a giving(at)torproject.org."
 
 #: 
tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:149
 #: 
tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:66
@@ -2924,7 +2926,7 @@ msgstr ""
 
 #: 
tmp/cache_locale/17/179dc1a0f488d5bbb8c128dc5c0fb35d6240d83414df10335a1cf4031139609a.php:83
 msgid "Florida"
-msgstr ""
+msgstr "Florida"
 
 #: 
tmp/cache_locale/17/179dc1a0f488d5bbb8c128dc5c0fb35d6240d83414df10335a1cf4031139609a.php:85
 msgid ""
@@ -2957,7 +2959,7 @@ msgstr ""
 
 #: 
tmp/cache_locale/17/179dc1a0f488d5bbb8c128dc5c0fb35d6240d83414df10335a1cf4031139609a.php:99
 msgid "Maryland"
-msgstr ""
+msgstr "Maryland"
 
 #: 
tmp/cache_locale/17/179dc1a0f488d5bbb8c128dc5c0fb35d6240d83414df10335a1cf4031139609a.php:101
 msgid ""
@@ -2967,7 +2969,7 @@ msgstr ""
 
 #: 
tmp/cache_locale/17/179dc1a0f488d5bbb8c128dc5c0fb35d6240d83414df10335a1cf4031139609a.php:105
 msgid "Nevada"
-msgstr ""
+msgstr "Nevada"
 
 #: 
tmp/cache_locale/17/179dc1a0f488d5bbb8c128dc5c0fb35d6240d83414df10335a1cf4031139609a.php:107
 msgid ""
@@ -2977,7 +2979,7 @@ msgstr ""
 
 #: 
tmp/cache_locale/17/179dc1a0f488d5bbb8c128dc5c0fb35d6240d83414df10335a1cf4031139609a.php:111
 msgid "New Jersey"
-msgstr ""
+msgstr "New Jersey"
 
 #: 
tmp/cache_locale/17/179dc1a0f488d5bbb8c128dc5c0fb35d6240d83414df10335a1cf4031139609a.php:113
 msgid ""
@@ -2996,7 +2998,7 @@ msgstr ""
 
 #: 
tmp/cache_locale/17/179dc1a0f488d5bbb8c128dc5c0fb35d6240d83414df10335a1cf4031139609a.php:119
 msgid "New York"
-msgstr ""
+msgstr "New York"
 
 #: 
tmp/cache_locale/17/179dc1a0f488d5bbb8c128dc5c0fb35d6240d83414df10335a1cf4031139609a.php:121
 msgid ""
@@ -3008,7 +3010,7 @@ msgstr ""
 
 #: 
tmp/cache_locale/17/179dc1a0f488d5bbb8c128dc5c0fb35d6240d83414df10335a1cf4031139609a.php:125
 msgid "North Carolina"
-msgstr ""
+msgstr "North Carolina"
 
 #: 
tmp/cache_locale/17/179dc1a0f488d5bbb8c128dc5c0fb35d6240d83414df10335a1cf4031139609a.php:127
 msgid ""
@@ -3022,7 +3024,7 @@ msgstr ""
 
 #: 
tmp/cache_locale/17/179dc1a0f488d5bbb8c128dc5c0fb35d6240d83414df10335a1cf4031139609a.php:133
 msgid "Pennsylvania"
-msgstr ""
+msgstr "Pennsylvania"
 
 #: 
tmp/cache_locale/17/179dc1a0f488d5bbb8c128dc5c0fb35d6240d83414df10335a1cf4031139609a.php:135
 msgid ""
@@ -3033,7 +3035,7 @@ msgstr ""
 
 #:

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

2020-03-18 Thread translation

commit 06d02dff37c04fc3f188e50c7b57cdb2f84c3f2c
Author: Translation commit bot 
Date:   Thu Mar 19 00:23:34 2020 +

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

diff --git a/contents+es-AR.po b/contents+es-AR.po
index 0e99691bd0..8f5c7ca456 100644
--- a/contents+es-AR.po
+++ b/contents+es-AR.po
@@ -1,8 +1,8 @@
 # Translators:
 # Emma Peel, 2019
-# JoaquÃn Serna , 2019
 # erinm, 2019
 # Zuhualime Akoochimoya, 2019
+# JoaquÃn Serna , 2020
 # 
 msgid ""
 msgstr ""
@@ -10,7 +10,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-02-27 18:30+CET\n"
 "PO-Revision-Date: 2018-10-02 22:41+\n"
-"Last-Translator: Zuhualime Akoochimoya, 2019\n"
+"Last-Translator: JoaquÃn Serna , 2020\n"
 "Language-Team: Spanish (Argentina) 
(https://www.transifex.com/otf/teams/1519/es_AR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -7941,7 +7941,7 @@ msgstr "Soporte"
 #: https//support.torproject.org/misc/menu/
 #: (content/misc/menu/contents+en.lrquestion.description)
 msgid "Community"
-msgstr ""
+msgstr "Comunidad"
 
 #: https//support.torproject.org/misc/misc-1/
 #: (content/misc/misc-1/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/tpo-web] https://gitweb.torproject.org/translation.git/commit/?h=tpo-web

2020-03-18 Thread translation

commit c13be25369f8c197682fc4107c8cf91586db86cf
Author: Translation commit bot 
Date:   Thu Mar 19 00:23:03 2020 +

https://gitweb.torproject.org/translation.git/commit/?h=tpo-web
---
 contents+es-AR.po | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/contents+es-AR.po b/contents+es-AR.po
index 35784a3e92..3e28e4b5a3 100644
--- a/contents+es-AR.po
+++ b/contents+es-AR.po
@@ -1,8 +1,8 @@
 # Translators:
 # ezemelano , 2019
-# JoaquÃn Serna , 2019
 # Zuhualime Akoochimoya, 2019
 # erinm, 2020
+# JoaquÃn Serna , 2020
 # 
 msgid ""
 msgstr ""
@@ -10,7 +10,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: erinm, 2020\n"
+"Last-Translator: JoaquÃn Serna , 2020\n"
 "Language-Team: Spanish (Argentina) 
(https://www.transifex.com/otf/teams/1519/es_AR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -149,7 +149,7 @@ msgstr ""
 
 #: https//www.torproject.org/menu/ (content/menu/contents+en.lrpage.body)
 msgid "Community"
-msgstr ""
+msgstr "Comunidad"
 
 #: https//www.torproject.org/thank-you/
 #: (content/thank-you/contents+en.lrpage.title)

___
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

2020-03-18 Thread translation

commit 048fc61e7a1fdfbe7ac0b7b8225c6463fcf6c53e
Author: Translation commit bot 
Date:   Thu Mar 19 00:20:01 2020 +

https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot
---
 contents+es-AR.po | 39 ++-
 1 file changed, 26 insertions(+), 13 deletions(-)

diff --git a/contents+es-AR.po b/contents+es-AR.po
index 5108861e88..6814d87db4 100644
--- a/contents+es-AR.po
+++ b/contents+es-AR.po
@@ -3,6 +3,7 @@
 # Emma Peel, 2018
 # erinm, 2019
 # Zuhualime Akoochimoya, 2020
+# JoaquÃn Serna , 2020
 # 
 msgid ""
 msgstr ""
@@ -10,7 +11,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-01-15 15:58+CET\n"
 "PO-Revision-Date: 2018-11-14 12:31+\n"
-"Last-Translator: Zuhualime Akoochimoya, 2020\n"
+"Last-Translator: JoaquÃn Serna , 2020\n"
 "Language-Team: Spanish (Argentina) 
(https://www.transifex.com/otf/teams/1519/es_AR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -55,7 +56,7 @@ msgstr "Soporte"
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
 msgid "Community"
-msgstr ""
+msgstr "Comunidad"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
@@ -152,17 +153,17 @@ msgstr "Siendo traductor para Tor"
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
 msgid "Making Tor Browser portable"
-msgstr ""
+msgstr "Hacer portable el Navegador Tor"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
 msgid "Installation"
-msgstr ""
+msgstr "InstalaciÃ³n"
 
 #: https//tb-manual.torproject.org/about/
 #: (content/about/contents+en.lrtopic.title)
 msgid "ABOUT TOR BROWSER"
-msgstr ""
+msgstr "ACERCA DEL NAVEGADOR TOR"
 
 #: https//tb-manual.torproject.org/about/
 #: (content/about/contents+en.lrtopic.description)
@@ -221,11 +222,15 @@ msgid ""
 " valid for a single session (until Tor Browser is exited or a [New Identity"
 "](/managing-identities/#new-identity) is requested)."
 msgstr ""
+"Por defecto, el Navegador Tor no guarda ningÃºn historial de navegaciÃ³n. Las 
"
+"Cookies son vÃ¡lidas para una sola sesiÃ³n (hasta que el Navegador Tor sea "
+"cerrado o una [Nueva Identidad](/es/managing-identities/#nueva-identidad) "
+"sea solicitada)."
 
 #: https//tb-manual.torproject.org/about/
 #: (content/about/contents+en.lrtopic.body)
 msgid "### HOW TOR WORKS"
-msgstr ""
+msgstr "### COMO FUNCIONA TOR"
 
 #: https//tb-manual.torproject.org/about/
 #: (content/about/contents+en.lrtopic.body)
@@ -267,7 +272,7 @@ msgstr ""
 #: https//tb-manual.torproject.org/downloading/
 #: (content/downloading/contents+en.lrtopic.title)
 msgid "DOWNLOADING"
-msgstr ""
+msgstr "DESCARGANDO"
 
 #: https//tb-manual.torproject.org/downloading/
 #: (content/downloading/contents+en.lrtopic.description)
@@ -280,6 +285,9 @@ msgid ""
 "The safest and simplest way to download Tor Browser is from the official Tor"
 " Project website at https://www.torproject.org/download.;
 msgstr ""
+"La manera mÃ¡s segura y simple de descargar el Navegador Tor es desde el "
+"sitio web oficial del Proyecto Tor en "
+"https://www.torproject.org/es/download.;
 
 #: https//tb-manual.torproject.org/downloading/
 #: (content/downloading/contents+en.lrtopic.body)
@@ -312,7 +320,7 @@ msgstr ""
 #: https//tb-manual.torproject.org/downloading/
 #: (content/downloading/contents+en.lrtopic.body)
 msgid "### MIRRORS"
-msgstr ""
+msgstr "### ESPEJOS"
 
 #: https//tb-manual.torproject.org/downloading/
 #: (content/downloading/contents+en.lrtopic.body)
@@ -322,11 +330,16 @@ msgid ""
 "mirrors, either through [EFF](https://tor.eff.org), [Calyx "
 "Institute](https://tor.calyxinstitute.org) or [CCC](https://tor.ccc.de)."
 msgstr ""
+"Si no sos capaz de descargar el Navegador Tor del sitio web oficial del "
+"Proyecto Tor, puedes intentar descargarlo de uno de nuestros sitios espejo "
+"oficiales, tanto a travÃ©s de [EFF](https://tor.eff.org/es), [Calyx "
+"Institute](https://tor.calyxinstitute.org/es) o "
+"[CCC](https://tor.ccc.de/es)."
 
 #: https//tb-manual.torproject.org/downloading/
 #: (content/downloading/contents+en.lrtopic.body)
 msgid "### GETTOR"
-msgstr ""
+msgstr "### GETTOR"
 
 #: https//tb-manual.torproject.org/downloading/
 #: (content/downloading/contents+en.lrtopic.body)
@@ -342,7 +355,7 @@ msgstr ""
 #: https//tb-manual.torproject.org/downloading/
 #: (content/downloading/contents+en.lrtopic.body)
 msgid "### TO USE GETTOR VIA EMAIL:"
-msgstr ""
+msgstr "### USAR GETTOR VÃA CORREO ELECTRÃNICO:"
 
 #: https//tb-manual.torproject.org/downloading/
 #: (content/downloading/contents+en.lrtopic.body)
@@ -375,7 +388,7 @@ msgstr ""
 #: https//tb-manual.torproject.org/downloading/
 #: (content/downloading/contents+en.lrtopic.body)
 msgid "### TO USE GETTOR VIA JABBER/XMPP (JITSI, COYIM, ETC.):"
-msgstr ""
+msgstr "### USAR GETTOR VÃA JABBER/XMPP (JITSI, COYIM, ETC.):"
 
 #: https//tb-manual.torproject.org/downloading/

[tor-commits] [bridgedb/develop] Add an info page to BridgeDB.

2020-03-18 Thread phw

commit bdf192de48baf2a67f47833358ec970c0bc3b5fd
Author: Philipp Winter 
Date:   Tue Mar 10 15:34:26 2020 -0700

Add an info page to BridgeDB.

This commit adds an info page to BridgeDB.  Tor's Relay Search for
bridges will link to this info page because it explains BridgeDB's
bridge distribution mechanisms.

This fixes .
---
 CHANGELOG   |   5 +
 bridgedb/distributors/https/server.py   |  13 ++-
 bridgedb/distributors/https/templates/base.html |   4 +-
 bridgedb/distributors/https/templates/info.html |  40 
 bridgedb/i18n/templates/bridgedb.pot| 128 
 bridgedb/strings.py |  41 
 6 files changed, 207 insertions(+), 24 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 163fc6c..b0e8275 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,8 @@
+* FIXES https://bugs.torproject.org/33008
+Add an info page, available at bridges.torproject.org/info.  Relay
+Search links to this info page to explain to bridge operators what 
their
+bridge distribution mechanism means.
+
 Changes in version 0.9.4 - 2020-02-19
 
 * FIXES https://bugs.torproject.org/30946
diff --git a/bridgedb/distributors/https/server.py 
b/bridgedb/distributors/https/server.py
index 503744e..be99262 100644
--- a/bridgedb/distributors/https/server.py
+++ b/bridgedb/distributors/https/server.py
@@ -389,13 +389,14 @@ class 
TranslatedTemplateResource(CustomErrorHandlingResource, CSPResource):
 """
 isLeaf = True
 
-def __init__(self, template=None):
+def __init__(self, template=None, showFaq=True):
 """Create a new :api:`Resource ` for a
 Mako-templated webpage.
 """
 gettext.install("bridgedb")
 CSPResource.__init__(self)
 self.template = template
+self.showFaq = showFaq
 
 def render_GET(self, request):
 self.setCSPHeader(request)
@@ -409,7 +410,8 @@ class 
TranslatedTemplateResource(CustomErrorHandlingResource, CSPResource):
getSortedLangList(),
rtl=rtl,
lang=langs[0],
-   
langOverride=translations.isLangOverridden(request))
+   
langOverride=translations.isLangOverridden(request),
+   showFaq=self.showFaq)
 except Exception as err:  # pragma: no cover
 rendered = replaceErrorPage(request, err)
 request.setHeader("Content-Type", "text/html; charset=utf-8")
@@ -435,6 +437,11 @@ class OptionsResource(TranslatedTemplateResource):
 TranslatedTemplateResource.__init__(self, 'options.html')
 
 
+class InfoResource(TranslatedTemplateResource):
+def __init__(self):
+TranslatedTemplateResource.__init__(self, 'info.html', showFaq=False)
+
+
 class HowtoResource(TranslatedTemplateResource):
 """A resource which explains how to use bridges."""
 
@@ -1133,6 +1140,7 @@ def addWebServer(config, distributor):
 index   = IndexResource()
 options = OptionsResource()
 howto   = HowtoResource()
+info= InfoResource()
 robots  = static.File(os.path.join(TEMPLATE_DIR, 'robots.txt'))
 assets  = static.File(os.path.join(TEMPLATE_DIR, 'assets/'))
 keys= static.Data(strings.BRIDGEDB_OPENPGP_KEY.encode('utf-8'), 
'text/plain')
@@ -1148,6 +1156,7 @@ def addWebServer(config, distributor):
 root.putChild(b'assets', assets)
 root.putChild(b'options', options)
 root.putChild(b'howto', howto)
+root.putChild(b'info', info)
 root.putChild(b'maintenance', maintenance)
 root.putChild(b'error', resource500)
 root.putChild(CSPResource.reportURI, csp)
diff --git a/bridgedb/distributors/https/templates/base.html 
b/bridgedb/distributors/https/templates/base.html
index fb54e81..b42d252 100644
--- a/bridgedb/distributors/https/templates/base.html
+++ b/bridgedb/distributors/https/templates/base.html
@@ -1,7 +1,7 @@
 ## -*- coding: utf-8 -*-
 
 <%namespace name="base" file="base.html" inheritable="True"/>
-<%page args="strings, langs, rtl=False, lang='en', langOverride=False, 
**kwargs"/>
+<%page args="strings, langs, rtl=False, lang='en', langOverride=False, 
showFaq=True, **kwargs"/>
 
 
 
@@ -59,6 +59,7 @@
 
 ${next.body(strings, langs, rtl=rtl, lang=lang, langOverride=langOverride, 
**kwargs)}
 
+% if showFaq:
 
   
 
@@ -84,6 +85,7 @@ ${next.body(strings, langs, rtl=rtl, lang=lang, 
langOverride=langOverride, **kwa
 
   
  
+% endif
 
 
 
diff --git a/bridgedb/distributors/https/templates/info.html 
b/bridgedb/distributors/https/templates/info.html
new file mode 100644
index 000..32f9e0a
--- /dev/null
+++ b/bridgedb/distributors/https/templates/info.html
@@ -0,0

[tor-commits] [bridgedb/develop] Merge branch 'fix-moat-api-doc' into develop

2020-03-18 Thread phw

commit 580222dc556718db1799f2b22304147783becc4c
Merge: f23c021 c894bbe
Author: Philipp Winter 
Date:   Wed Mar 18 14:39:26 2020 -0700

Merge branch 'fix-moat-api-doc' into develop

 README.rst | 28 ++--
 1 file changed, 14 insertions(+), 14 deletions(-)

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

[tor-commits] [bridgedb/develop] Merge branch 'enhancement/33008' into develop

2020-03-18 Thread phw

commit f23c0213bb1f1e030eaae5d1ac2b26d2a91244e4
Merge: ef9ea5c bdf192d
Author: Philipp Winter 
Date:   Wed Mar 18 10:37:54 2020 -0700

Merge branch 'enhancement/33008' into develop

 CHANGELOG   |   5 +
 bridgedb/distributors/https/server.py   |  13 ++-
 bridgedb/distributors/https/templates/base.html |   4 +-
 bridgedb/distributors/https/templates/info.html |  40 
 bridgedb/i18n/templates/bridgedb.pot| 128 
 bridgedb/strings.py |  41 
 6 files changed, 207 insertions(+), 24 deletions(-)



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

[tor-commits] [bridgedb/develop] Fixed Moat API documentation.

2020-03-18 Thread phw

commit c894bbe1070adeadfe6a6e8f1a02c8e46075159b
Author: Benjamin Erhart 
Date:   Wed Mar 18 21:09:37 2020 +0100

Fixed Moat API documentation.
---
 README.rst | 28 ++--
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/README.rst b/README.rst
index 896d25d..1a338ea 100644
--- a/README.rst
+++ b/README.rst
@@ -406,14 +406,14 @@ The client SHOULD direct all requests via the Meek 
reflector at ``MEEK_REFECTOR`
 Requesting Bridges
 ""
 
-The client MUST send a ``POST /meek/moat/fetch`` containing the following 
JSON::
+The client MUST send a ``POST /moat/fetch`` containing the following JSON::
 
 {
-  "data": {
+  "data": [{
 "version": "0.1.0",
 "type": "client-transports",
 "supported": [ "TRANSPORT", "TRANSPORT", ... ],
-  }
+  }]
 }
 
 where:
@@ -437,14 +437,14 @@ the "best" transport from the list of supported 
transports, and respond with the
 following JSON containing a CAPTCHA challenge::
 
 {
-  "data": {
+  "data": [{
 "id": "1",
 "type": "moat-challenge",
 "version": "0.1.0",
 "transport": "TRANSPORT",
 "image": "CAPTCHA",
 "challenge": "CHALLENGE",
-  }
+  }]
 }
 
 where:
@@ -463,14 +463,14 @@ If there is no overlap with the transports which BridgeDB 
supports, the moat
 server will respond with the list of transports which is *does* support::
 
 {
-  "data": {
+  "data": [{
 "id": "1",
 "type": "moat-challenge",
 "version": "0.1.0",
 "transport": [ "TRANSPORT", "TRANSPORT", ... ],
 "image": "CAPTCHA",
 "challenge": "CHALLENGE",
-  }
+  }]
 }
 
 
@@ -478,10 +478,10 @@ Responding to a CAPTCHA challenge
 "
 
 To propose a solution to a CAPTCHA, the client MUST send a request for ``POST
-/meek/moat/check``, where the body of the request contains the following JSON::
+/moat/check``, where the body of the request contains the following JSON::
 
 {
-  "data": {
+  "data": [{
 "id": "2",
 "type": "moat-solution",
 "version": "0.1.0",
@@ -489,7 +489,7 @@ To propose a solution to a CAPTCHA, the client MUST send a 
request for ``POST
 "challenge": "CHALLENGE",
 "solution": "SOLUTION",
 "qrcode": "BOOLEAN",
-  }
+  }]
 }
 
 
@@ -515,13 +515,13 @@ If the ``SOLUTION`` was successful for the supplied 
``CHALLENGE``, the
 server responds ``200 OK`` with the following JSON::
 
 {
-  "data": {
+  "data": [{
 "id": "3",
 "type": "moat-bridges",
 "version": "0.1.0",
 "bridges": [ "BRIDGE_LINE", ... ],
 "qrcode": "QRCODE",
-  }
+  }]
 }
 
 where:
@@ -557,8 +557,8 @@ where:
 Other Responses
 """
 
-If the client requested some page other than ``/meek/moat/fetch``, or
-``/meek/moat/check``, the server MUST respond with ``501 Not Implemented``.
+If the client requested some page other than ``/moat/fetch``, or
+``/moat/check``, the server MUST respond with ``501 Not Implemented``.
 
 If the client attempts any other HTTP method, other than ``POST``, the server
 MUST respond ``403 FORBIDDEN``.



___
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

2020-03-18 Thread translation

commit 02dc78f48f31e0ede0e82a38458c59e86bb1ef52
Author: Translation commit bot 
Date:   Wed Mar 18 22:50:16 2020 +


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

diff --git a/contents+fr.po b/contents+fr.po
index 5de326ab36..d97ee6fab9 100644
--- a/contents+fr.po
+++ b/contents+fr.po
@@ -833,6 +833,11 @@ msgid ""
 "'Use a bridge', and from the drop-down menu 'Select a built-in bridge', "
 "choose whichever pluggable transport you'd like to use."
 msgstr ""
+"Ou, si le NavigateurÂ Tor est en cours dâexÃ©cution, cliquez sur Â«Â 
PrÃ©fÃ©rences"
+"Â Â» dans le menu â¡, puis sur Â«Â TorÂ Â» dans la barre latÃ©rale. Dans la 
section "
+"Â«Â PontsÂ Â», cochez la case Â«Â Utiliser un bonÂ Â» et Ã  partir du menu 
dÃ©roulant "
+"Â«Â SÃ©lectionner un pont intÃ©grÃ©Â Â», choisissez le transport enfichable 
que "
+"vous souhaitez utiliser."
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)
@@ -1019,7 +1024,7 @@ msgstr ""
 #: https//tb-manual.torproject.org/bridges/
 #: (content/bridges/contents+en.lrtopic.body)
 msgid "Complete the CAPTCHA and click 'Submit'."
-msgstr ""
+msgstr "RÃ©pondez au captcha et cliquez sur Â«Â EnvoyerÂ Â»."
 
 #: https//tb-manual.torproject.org/bridges/
 #: (content/bridges/contents+en.lrtopic.body)
@@ -1315,6 +1320,8 @@ msgid ""
 "To use this option, you just need to click on 'New Identity' in Tor "
 "Browser's toolbar."
 msgstr ""
+"Pour utiliser cette option, vous devez simplement cliquer sur Â«Â Nouvelle "
+"identitÃ©Â Â» dans la barre dâoutils du NavigateurÂ Tor."
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
@@ -2296,7 +2303,7 @@ msgstr ""
 #: https//tb-manual.torproject.org/make-tor-portable/
 #: (content/make-tor-portable/contents+en.lrtopic.title)
 msgid "MAKE TOR BROWSER PORTABLE"
-msgstr ""
+msgstr "RENDRE LE NAVIGATEURÂ TOR PORTABLE"
 
 #: https//tb-manual.torproject.org/make-tor-portable/
 #: (content/make-tor-portable/contents+en.lrtopic.description)
@@ -2309,6 +2316,9 @@ msgid ""
 "If preferred, Tor Browser may be made portable by extracting it from its "
 "archive directly onto removable media such as a USB stick or SD card."
 msgstr ""
+"Si vous le prÃ©fÃ©rez, le NavigateurÂ Tor peut Ãªtre rendu portable en 
extrayant"
+" directement son archive sur un support amovible tel quâune clÃ© USB ou une 
"
+"carte SD."
 
 #: https//tb-manual.torproject.org/make-tor-portable/
 #: (content/make-tor-portable/contents+en.lrtopic.body)
@@ -2316,6 +2326,8 @@ msgid ""
 "It is recommended to use writable media so that Tor Browser can be updated "
 "as required."
 msgstr ""
+"Il est recommandÃ© dâutiliser un support inscriptible afin que le 
NavigateurÂ "
+"Tor puisse se mettre Ã  jour si nÃ©cessaire."
 
 #: https//tb-manual.torproject.org/make-tor-portable/
 #: (content/make-tor-portable/contents+en.lrtopic.body)
@@ -2323,6 +2335,8 @@ msgid ""
 "1. Plug in your removable media and format it. Any filesystem type will "
 "work."
 msgstr ""
+"1. Branchez votre support amovible et formatez-le. Tous les types de "
+"systÃ¨mes de fichiers fonctionneront."
 
 #: https//tb-manual.torproject.org/make-tor-portable/
 #: (content/make-tor-portable/contents+en.lrtopic.body)
@@ -2330,12 +2344,16 @@ msgid ""
 "2. Navigate to the Tor Browser [download "
 "page](https://torproject.org/download)."
 msgstr ""
+"2. AccÃ©dez Ã  la [page de 
tÃ©lÃ©chargement](https://torproject.org/fr/download)"
+" du NavigateurÂ Tor"
 
 #: https//tb-manual.torproject.org/make-tor-portable/
 #: (content/make-tor-portable/contents+en.lrtopic.body)
 msgid ""
 "3. Download the Windows `.exe` file and save it directly to your media."
 msgstr ""
+"3. TÃ©lÃ©chargez le fichier .exe pour Windows et enregistrez-le directement "
+"sur votre mÃ©dia."
 
 #: https//tb-manual.torproject.org/make-tor-portable/
 #: (content/make-tor-portable/contents+en.lrtopic.body)
@@ -2343,6 +2361,8 @@ msgid ""
 "4. (Recommended) Verify the [files "
 "signature](https://support.torproject.org/tbb/how-to-verify-signature/)."
 msgstr ""
+"4. (RecommandÃ©) VÃ©rifiez la [signature des "
+"fichiers](https://support.torproject.org/fr/tbb/how-to-verify-signature/)."
 
 #: https//tb-manual.torproject.org/make-tor-portable/
 #: (content/make-tor-portable/contents+en.lrtopic.body)
@@ -2350,6 +2370,8 @@ msgid ""
 "5. When the download is complete, click the `.exe` file and begin the "
 "installation process."
 msgstr ""
+"5. Une fois que le tÃ©lÃ©chargement est terminÃ©, cliquez sur le fichier .exe 
"
+"et lancez le processus dâinstallation."
 
 #: https//tb-manual.torproject.org/make-tor-portable/
 #: (content/make-tor-portable/contents+en.lrtopic.body)
@@ -2357,6 +2379,8 @@ msgid ""
 "6. When the installer asks where to install Tor Browser, select your "
 "removable media."

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

2020-03-18 Thread translation

commit ad96756f651ef3f623e46d8f73af589d3cc57b16
Author: Translation commit bot 
Date:   Wed Mar 18 22:49:59 2020 +

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

diff --git a/contents+fr.po b/contents+fr.po
index ba9945d958..d97ee6fab9 100644
--- a/contents+fr.po
+++ b/contents+fr.po
@@ -833,6 +833,11 @@ msgid ""
 "'Use a bridge', and from the drop-down menu 'Select a built-in bridge', "
 "choose whichever pluggable transport you'd like to use."
 msgstr ""
+"Ou, si le NavigateurÂ Tor est en cours dâexÃ©cution, cliquez sur Â«Â 
PrÃ©fÃ©rences"
+"Â Â» dans le menu â¡, puis sur Â«Â TorÂ Â» dans la barre latÃ©rale. Dans la 
section "
+"Â«Â PontsÂ Â», cochez la case Â«Â Utiliser un bonÂ Â» et Ã  partir du menu 
dÃ©roulant "
+"Â«Â SÃ©lectionner un pont intÃ©grÃ©Â Â», choisissez le transport enfichable 
que "
+"vous souhaitez utiliser."
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)
@@ -1019,7 +1024,7 @@ msgstr ""
 #: https//tb-manual.torproject.org/bridges/
 #: (content/bridges/contents+en.lrtopic.body)
 msgid "Complete the CAPTCHA and click 'Submit'."
-msgstr ""
+msgstr "RÃ©pondez au captcha et cliquez sur Â«Â EnvoyerÂ Â»."
 
 #: https//tb-manual.torproject.org/bridges/
 #: (content/bridges/contents+en.lrtopic.body)
@@ -1315,6 +1320,8 @@ msgid ""
 "To use this option, you just need to click on 'New Identity' in Tor "
 "Browser's toolbar."
 msgstr ""
+"Pour utiliser cette option, vous devez simplement cliquer sur Â«Â Nouvelle "
+"identitÃ©Â Â» dans la barre dâoutils du NavigateurÂ Tor."
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
@@ -2309,6 +2316,9 @@ msgid ""
 "If preferred, Tor Browser may be made portable by extracting it from its "
 "archive directly onto removable media such as a USB stick or SD card."
 msgstr ""
+"Si vous le prÃ©fÃ©rez, le NavigateurÂ Tor peut Ãªtre rendu portable en 
extrayant"
+" directement son archive sur un support amovible tel quâune clÃ© USB ou une 
"
+"carte SD."
 
 #: https//tb-manual.torproject.org/make-tor-portable/
 #: (content/make-tor-portable/contents+en.lrtopic.body)
@@ -2316,6 +2326,8 @@ msgid ""
 "It is recommended to use writable media so that Tor Browser can be updated "
 "as required."
 msgstr ""
+"Il est recommandÃ© dâutiliser un support inscriptible afin que le 
NavigateurÂ "
+"Tor puisse se mettre Ã  jour si nÃ©cessaire."
 
 #: https//tb-manual.torproject.org/make-tor-portable/
 #: (content/make-tor-portable/contents+en.lrtopic.body)
@@ -2323,6 +2335,8 @@ msgid ""
 "1. Plug in your removable media and format it. Any filesystem type will "
 "work."
 msgstr ""
+"1. Branchez votre support amovible et formatez-le. Tous les types de "
+"systÃ¨mes de fichiers fonctionneront."
 
 #: https//tb-manual.torproject.org/make-tor-portable/
 #: (content/make-tor-portable/contents+en.lrtopic.body)
@@ -2330,12 +2344,16 @@ msgid ""
 "2. Navigate to the Tor Browser [download "
 "page](https://torproject.org/download)."
 msgstr ""
+"2. AccÃ©dez Ã  la [page de 
tÃ©lÃ©chargement](https://torproject.org/fr/download)"
+" du NavigateurÂ Tor"
 
 #: https//tb-manual.torproject.org/make-tor-portable/
 #: (content/make-tor-portable/contents+en.lrtopic.body)
 msgid ""
 "3. Download the Windows `.exe` file and save it directly to your media."
 msgstr ""
+"3. TÃ©lÃ©chargez le fichier .exe pour Windows et enregistrez-le directement "
+"sur votre mÃ©dia."
 
 #: https//tb-manual.torproject.org/make-tor-portable/
 #: (content/make-tor-portable/contents+en.lrtopic.body)
@@ -2343,6 +2361,8 @@ msgid ""
 "4. (Recommended) Verify the [files "
 "signature](https://support.torproject.org/tbb/how-to-verify-signature/)."
 msgstr ""
+"4. (RecommandÃ©) VÃ©rifiez la [signature des "
+"fichiers](https://support.torproject.org/fr/tbb/how-to-verify-signature/)."
 
 #: https//tb-manual.torproject.org/make-tor-portable/
 #: (content/make-tor-portable/contents+en.lrtopic.body)
@@ -2350,6 +2370,8 @@ msgid ""
 "5. When the download is complete, click the `.exe` file and begin the "
 "installation process."
 msgstr ""
+"5. Une fois que le tÃ©lÃ©chargement est terminÃ©, cliquez sur le fichier .exe 
"
+"et lancez le processus dâinstallation."
 
 #: https//tb-manual.torproject.org/make-tor-portable/
 #: (content/make-tor-portable/contents+en.lrtopic.body)
@@ -2357,6 +2379,8 @@ msgid ""
 "6. When the installer asks where to install Tor Browser, select your "
 "removable media."
 msgstr ""
+"6. Quand le programme dâinstallation demande oÃ¹ installer le NavigateurÂ 
Tor,"
+" sÃ©lectionnez votre support amovible."
 
 #: https//tb-manual.torproject.org/make-tor-portable/
 #: (content/make-tor-portable/contents+en.lrtopic.body)

___
tor-commits mailing list
tor-commits@lists.torproject.org

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

2020-03-18 Thread translation

commit 34ad630d6b02afc0ecbcd1d591eee6f06c66a86a
Author: Translation commit bot 
Date:   Wed Mar 18 22:45:57 2020 +

https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere
---
 eo/https-everywhere.dtd |  2 +-
 pl/https-everywhere.dtd | 14 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/eo/https-everywhere.dtd b/eo/https-everywhere.dtd
index ce284a942a..c96b7bce5b 100644
--- a/eo/https-everywhere.dtd
+++ b/eo/https-everywhere.dtd
@@ -50,7 +50,7 @@
 
 
 
-
+
 
 
 
diff --git a/pl/https-everywhere.dtd b/pl/https-everywhere.dtd
index 34173bbfa4..14ee0ce5a0 100644
--- a/pl/https-everywhere.dtd
+++ b/pl/https-everywhere.dtd
@@ -29,8 +29,8 @@
 
 
 
-
-
+
+
 
 
 
@@ -47,13 +47,13 @@
 
 
 
-
+
 
 
-
-
-
-
+
+
+
+
 
 
 

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

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

2020-03-18 Thread translation

commit c421a25004ffede11d280e339d6e32fc3e9cd814
Author: Translation commit bot 
Date:   Wed Mar 18 22:46:03 2020 +


https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere_completed
---
 pl/https-everywhere.dtd | 9 +
 1 file changed, 9 insertions(+)

diff --git a/pl/https-everywhere.dtd b/pl/https-everywhere.dtd
index 824486d246..080df03526 100644
--- a/pl/https-everywhere.dtd
+++ b/pl/https-everywhere.dtd
@@ -29,6 +29,8 @@
 
 
 
+
+
 
 
 
@@ -45,6 +47,13 @@
 
 
 
+
+
+
+
+
+
+
 
 
 

___
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

2020-03-18 Thread translation

commit 5b806b1c5dc0b4f0e5047db05a30c566df89064d
Author: Translation commit bot 
Date:   Wed Mar 18 22:20:05 2020 +

https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot
---
 contents+fr.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contents+fr.po b/contents+fr.po
index 5de326ab36..ba9945d958 100644
--- a/contents+fr.po
+++ b/contents+fr.po
@@ -2296,7 +2296,7 @@ msgstr ""
 #: https//tb-manual.torproject.org/make-tor-portable/
 #: (content/make-tor-portable/contents+en.lrtopic.title)
 msgid "MAKE TOR BROWSER PORTABLE"
-msgstr ""
+msgstr "RENDRE LE NAVIGATEURÂ TOR PORTABLE"
 
 #: https//tb-manual.torproject.org/make-tor-portable/
 #: (content/make-tor-portable/contents+en.lrtopic.description)

___
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

2020-03-18 Thread translation

commit bb13093ca080b70c840a9eebd1838b8a517fb4f3
Author: Translation commit bot 
Date:   Wed Mar 18 22:15:26 2020 +


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

diff --git a/contents+de.po b/contents+de.po
index 149d6fb171..5dc7ad1b19 100644
--- a/contents+de.po
+++ b/contents+de.po
@@ -2885,6 +2885,8 @@ msgid ""
 "For an extensive resource, check [Support "
 "portal](https://support.torproject.org)."
 msgstr ""
+"Eine umfangreiche Ressource findest du unter [Support-Portal] "
+"(https://support.torproject.org)."
 
 #: https//community.torproject.org/training/faq/
 #: (content/training/faq/contents+en.lrpage.body)
@@ -2892,6 +2894,8 @@ msgid ""
 "* [Why is it called Tor?](https://support.torproject.org/about/why-is-it-;
 "called-tor/)"
 msgstr ""
+"* [Warum heiÃt es Tor?](https://support.torproject.org/about/why-is-it-;
+"called-tor/)"
 
 #: https//community.torproject.org/training/faq/
 #: (content/training/faq/contents+en.lrpage.body)
@@ -2899,6 +2903,8 @@ msgid ""
 "* [Does using Tor Browser protect other applications on my "
 "computer?](https://support.torproject.org/tbb/tbb-13/)"
 msgstr ""
+"* [SchÃ¼tzt die Verwendung von Tor Browser andere Anwendungen auf meinem "
+"Computer?](https://support.torproject.org/tbb/tbb-13/)"
 
 #: https//community.torproject.org/training/faq/
 #: (content/training/faq/contents+en.lrpage.body)
@@ -2906,6 +2912,8 @@ msgid ""
 "* [Is using Tor with a VPN more "
 "secure?](https://support.torproject.org/faq/faq-5/)"
 msgstr ""
+"* [Ist die Verwendung von Tor mit einem VPN "
+"sicherer?](https://support.torproject.org/faq/faq-5/)"
 
 #: https//community.torproject.org/training/faq/
 #: (content/training/faq/contents+en.lrpage.body)
@@ -2913,6 +2921,8 @@ msgid ""
 "* [Can I browse HTTPS sites with "
 "Tor?](https://support.torproject.org/https/https-2/)"
 msgstr ""
+"* [Kann ich mit Tor auf HTTPS-Seiten "
+"surfen?](https://support.torproject.org/https/https-2/)"
 
 #: https//community.torproject.org/training/faq/
 #: (content/training/faq/contents+en.lrpage.body)
@@ -2920,6 +2930,8 @@ msgid ""
 "* [Is it possible to find out the path that a client is taking on the Tor "
 "Network?](https://support.torproject.org/misc/misc-1/)"
 msgstr ""
+"* [Ist es mÃ¶glich, den Pfad herauszufinden, den ein Programm im Tor-Netzwerk"
+" einschlÃ¤gt?](https://support.torproject.org/misc/misc-1/)"
 
 #: https//community.torproject.org/training/faq/
 #: (content/training/faq/contents+en.lrpage.body)
@@ -2927,6 +2939,8 @@ msgid ""
 "* [Why don't you prevent bad people from doing bad things when using "
 "Tor?](https://support.torproject.org/misc/misc-2/)"
 msgstr ""
+"* [Warum verhindert ihr nicht, dass bÃ¶se Menschen schlechte Dinge tun, wenn "
+"sie Tor benutzen?](https://support.torproject.org/misc/misc-2/)"
 
 #: https//community.torproject.org/training/faq/
 #: (content/training/faq/contents+en.lrpage.body)
@@ -2934,6 +2948,8 @@ msgid ""
 "* [When I use Tor Browser, will anyone be able to tell which websites I "
 "visit?](https://support.torproject.org/tbb/tbb-3/)"
 msgstr ""
+"* [Wenn ich den Tor Browser benutze, kann jeder erkennen, welche Webseiten "
+"ich besuche?](https://support.torproject.org/tbb/tbb-3/)"
 
 #: https//community.torproject.org/training/faq/
 #: (content/training/faq/contents+en.lrpage.body)
@@ -2941,6 +2957,8 @@ msgid ""
 "* [Why did my search engine switch to DuckDuckGo? Or what is "
 "DuckDuckGo?](https://support.torproject.org/tbb/tbb-41/)"
 msgstr ""
+"* [Warum hat meine Suchmaschine zu DuckDuckGo gewechselt? Oder was ist "
+"DuckDuckGo?](https://support.torproject.org/tbb/tbb-41/)"
 
 #: https//community.torproject.org/training/faq/
 #: (content/training/faq/contents+en.lrpage.body)
@@ -2948,6 +2966,8 @@ msgid ""
 "* [What is a "
 "bridge?](https://support.torproject.org/censorship/censorship-7/)"
 msgstr ""
+"* [Was ist eine "
+"BrÃ¼cke?](https://support.torproject.org/censorship/censorship-7/)"
 
 #: https//community.torproject.org/training/faq/
 #: (content/training/faq/contents+en.lrpage.body)
@@ -2955,6 +2975,8 @@ msgid ""
 "* [Tor Browser won't connect, but it doesnât seem to be an issue with "
 "censorship.](https://support.torproject.org/tbb/tbb-20/)"
 msgstr ""
+"* [Der Tor Browser stellt keine Verbindung her, aber es scheint kein Problem"
+" mit der Zensur zu sein.](https://support.torproject.org/tbb/tbb-20/)"
 
 #: https//community.torproject.org/training/faq/
 #: (content/training/faq/contents+en.lrpage.body)
@@ -2962,6 +2984,9 @@ msgid ""
 "* [What is the difference between using Tor Browser and 'incognito mode' or "
 "private tabs? ](https://support.torproject.org/tbb/tbb-and-incognito-mode/)"
 msgstr ""
+"* [Was ist der Unterschied zwischen der Verwendung des Tor Browsers und dem "
+"'inkognito Modus' oder privaten Tabs? ](https://support.torproject.org/tbb;

[tor-commits] [tor-browser/tor-browser-68.6.0esr-9.0-1] fixup! Pick up latest Torbutton code

2020-03-18 Thread sysrqb

commit 548667337447d5d410d20d136d61a73196f9ead4
Author: Matthew Finkel 
Date:   Wed Mar 18 18:32:33 2020 +

fixup! Pick up latest Torbutton code
---
 toolkit/torproject/torbutton | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/toolkit/torproject/torbutton b/toolkit/torproject/torbutton
index e4fcf3067d24..690704a9bc3b 16
--- a/toolkit/torproject/torbutton
+++ b/toolkit/torproject/torbutton
@@ -1 +1 @@
-Subproject commit e4fcf3067d24d8abc0a00093529bbfefd71c8d0d
+Subproject commit 690704a9bc3bd3a146db9689bc59d3b9e8702b15

___
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

2020-03-18 Thread translation

commit 9a3bf9227383a8c6715e01db07ea184af7a8cb04
Author: Translation commit bot 
Date:   Wed Mar 18 21:45:27 2020 +


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

diff --git a/contents+de.po b/contents+de.po
index 64d0b4b5a1..149d6fb171 100644
--- a/contents+de.po
+++ b/contents+de.po
@@ -2652,6 +2652,8 @@ msgid ""
 "2. Promote your event in your community's spaces, taking safety into "
 "consideration."
 msgstr ""
+"2. Bewirb deine Veranstaltung in den RÃ¤umen deiner Community unter "
+"BerÃ¼cksichtigung der Sicherheit."
 
 #: https//community.torproject.org/training/best-practices/
 #: (content/training/best-practices/contents+en.lrpage.body)
@@ -2661,6 +2663,11 @@ msgid ""
 "require community members to share information individually to other trusted"
 " people."
 msgstr ""
+"Unter vielen UmstÃ¤nden eignen sich soziale Medien hervorragend fÃ¼r die "
+"Werbung, aber fÃ¼r Gruppen mit hÃ¶herem Risiko mÃ¶chtest du vielleicht ein "
+"kleineres Mund-zu-Mund-Propaganda-Netzwerk nutzen oder von den Mitgliedern "
+"der Community verlangen, Informationen individuell an andere "
+"vertrauenswÃ¼rdige Personen weiterzugeben."
 
 #: https//community.torproject.org/training/best-practices/
 #: (content/training/best-practices/contents+en.lrpage.body)
@@ -2668,37 +2675,45 @@ msgid ""
 "3. Create localized handouts for some of the more difficult concepts that "
 "you'll be teaching."
 msgstr ""
+"3. Erstell lokale Handouts fÃ¼r einige der schwierigeren Konzepte, die du "
+"unterrichten wirst."
 
 #: https//community.torproject.org/training/best-practices/
 #: (content/training/best-practices/contents+en.lrpage.body)
 msgid "4. Make sure you have plenty of stickers to hand out to participants!"
 msgstr ""
+"4. Sorge dafÃ¼r, dass du viele Aufkleber an die Teilnehmer verteilen kannst!"
 
 #: https//community.torproject.org/training/best-practices/
 #: (content/training/best-practices/contents+en.lrpage.body)
 msgid "5. Create a link list of all the resources you'll be talking about."
 msgstr ""
+"5. Erstelle eine Linkliste mit allen Ressourcen, Ã¼ber die du sprechen "
+"werden."
 
 #: https//community.torproject.org/training/best-practices/
 #: (content/training/best-practices/contents+en.lrpage.body)
 msgid "This includes downloads and PDFs of handouts."
-msgstr ""
+msgstr "Dazu gehÃ¶ren Downloads und PDFs von Handzetteln."
 
 #: https//community.torproject.org/training/best-practices/
 #: (content/training/best-practices/contents+en.lrpage.body)
 msgid ""
 "You'll share this link list on a whiteboard or project it at the training."
 msgstr ""
+"Stelle diese Linkliste auf einer Tafel zur VerfÃ¼gung oder projiziere sie "
+"beim Training."
 
 #: https//community.torproject.org/training/best-practices/
 #: (content/training/best-practices/contents+en.lrpage.body)
 msgid "6. Determine how you'll do hands-on assistance at your training."
 msgstr ""
+"6. Lege fest, wie du bei deiner Ausbildung praktische Hilfe leisten willst."
 
 #: https//community.torproject.org/training/best-practices/
 #: (content/training/best-practices/contents+en.lrpage.body)
 msgid "Will you be able to handle this alone? Or will you require partners?"
-msgstr ""
+msgstr "Wirst du das allein bewÃ¤ltigen kÃ¶nnen? Oder benÃ¶tigst du Partner?"
 
 #: https//community.torproject.org/training/best-practices/
 #: (content/training/best-practices/contents+en.lrpage.body)
@@ -2708,6 +2723,10 @@ msgid ""
 "the community to make sure they're okay with you bringing in additional "
 "trainers."
 msgstr ""
+"Wenn du mehr Hilfe benÃ¶tigst, stelle sicher, dass die Partner, die du "
+"mitbringst, sich der SicherheitsbedÃ¼rfnisse der Community bewusst sind, und "
+"kommuniziere mit deinen Kontakten in der Community, um sicherzustellen, dass"
+" sie damit einverstanden sind, dass du zusÃ¤tzliche Ausbilder mitbringst."
 
 #: https//community.torproject.org/training/best-practices/
 #: (content/training/best-practices/contents+en.lrpage.body)
@@ -2717,6 +2736,10 @@ msgid ""
 "odp and pdf -- and on at least one additional device -- for example, on your"
 " computer and on a USB stick."
 msgstr ""
+"7. Stelle sicher, dass deine PrÃ¤sentation aktuell ist (sowohl Informationen "
+"als auch Screenshots) und speichere deine PrÃ¤sentation in zwei Datei-"
+"Formaten - z.B. odp und pdf - und auf mindestens einem zusÃ¤tzlichen GerÃ¤t - 
"
+"z.B. auf deinem Computer und auf einem USB-Stick."
 
 #: https//community.torproject.org/training/best-practices/
 #: (content/training/best-practices/contents+en.lrpage.body)
@@ -2724,6 +2747,8 @@ msgid ""
 "8. Decide how you will facilitate a safer space. We recommend using the [Tor"
 " Code of Conduct](/training/code-of-conduct/)."
 msgstr ""
+"8. Entscheide, wie du einen sichereren Raum ermÃ¶glichst. Wir empfehlen die "
+"Verwendung des

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

2020-03-18 Thread translation

commit 9be007a831599af972a51a1c1fd1c7d26864e683
Author: Translation commit bot 
Date:   Wed Mar 18 21:16:06 2020 +

https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere
---
 de/https-everywhere.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/de/https-everywhere.dtd b/de/https-everywhere.dtd
index 662ac4c86d..7176d14d9d 100644
--- a/de/https-everywhere.dtd
+++ b/de/https-everywhere.dtd
@@ -50,7 +50,7 @@
 
 
 
-
+
 
 
 

___
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

2020-03-18 Thread translation

commit f55a2591e1160adf740b018a2d43a1f882d9c20f
Author: Translation commit bot 
Date:   Wed Mar 18 21:15:27 2020 +


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

diff --git a/contents+de.po b/contents+de.po
index 580f513e07..64d0b4b5a1 100644
--- a/contents+de.po
+++ b/contents+de.po
@@ -2530,7 +2530,7 @@ msgstr "[  ] Privat an die Community-Gruppe berichtest"
 #: https//community.torproject.org/training/best-practices/
 #: (content/training/best-practices/contents+en.lrpage.title)
 msgid "Training Best Practices"
-msgstr ""
+msgstr "BewÃ¤hrte Praktiken fÃ¼r die Ausbildung"
 
 #: https//community.torproject.org/training/best-practices/
 #: (content/training/best-practices/contents+en.lrpage.subtitle)
@@ -2539,11 +2539,14 @@ msgid ""
 "Good preparation is essential to an effective and safe training, so we've "
 "curated some resources to help you make the most of your training event."
 msgstr ""
+"Eine gute Vorbereitung ist fÃ¼r ein effektives und sicheres Training "
+"unerlÃ¤sslich, daher haben wir einige Ressourcen zusammengestellt, die dir "
+"helfen, das Beste aus deiner Trainingsveranstaltung zu machen."
 
 #: https//community.torproject.org/training/best-practices/
 #: (content/training/best-practices/contents+en.lrpage.cta)
 msgid "Best Practices for Trainers"
-msgstr ""
+msgstr "BewÃ¤hrte Praktiken fÃ¼r Ausbilder"
 
 #: https//community.torproject.org/training/best-practices/
 #: (content/training/best-practices/contents+en.lrpage.body)
@@ -2551,16 +2554,19 @@ msgid ""
 "Running security training is a fun and rewarding way to help your community "
 "conduct human rights work safely."
 msgstr ""
+"Die DurchfÃ¼hrung von Sicherheitstrainings ist eine unterhaltsame und "
+"lohnende MÃ¶glichkeit, deine Community bei der sicheren DurchfÃ¼hrung von "
+"Menschenrechtsarbeit zu unterstÃ¼tzen."
 
 #: https//community.torproject.org/training/best-practices/
 #: (content/training/best-practices/contents+en.lrpage.body)
 msgid "## Before the training"
-msgstr ""
+msgstr "## Vor dem Training"
 
 #: https//community.torproject.org/training/best-practices/
 #: (content/training/best-practices/contents+en.lrpage.body)
 msgid "_Am I the right person to give this training?_"
-msgstr ""
+msgstr "_Bin ich die richtige Person, um dieses Training zu geben?_"
 
 #: https//community.torproject.org/training/best-practices/
 #: (content/training/best-practices/contents+en.lrpage.body)
@@ -2569,6 +2575,9 @@ msgid ""
 "but there are additional considerations to be made before training some at-"
 "risk groups."
 msgstr ""
+"Sicherheitstrainings kÃ¶nnen den Menschen helfen, sicher zu kommunizieren und"
+" das Internet zu nutzen, aber vor dem Training einiger Risikogruppen mÃ¼ssen "
+"zusÃ¤tzliche Ãberlegungen angestellt werden."
 
 #: https//community.torproject.org/training/best-practices/
 #: (content/training/best-practices/contents+en.lrpage.body)
@@ -2577,6 +2586,9 @@ msgid ""
 "Companion, [\"Am I the right person to give this "
 "training?\"](https://sec.eff.org/articles/right-person-to-train)."
 msgstr ""
+"Deshalb empfehlen wir diese Ressource des Security Education Companion der "
+"EFF, [\"Bin ich die richtige Person, um dieses Training zu geben?\"] "
+"(https://sec.eff.org/articles/right-person-to-train)."
 
 #: https//community.torproject.org/training/best-practices/
 #: (content/training/best-practices/contents+en.lrpage.body)
@@ -2584,17 +2596,23 @@ msgid ""
 "This resource can help you be sure that you're doing the best by the "
 "community of people you wish to train."
 msgstr ""
+"Diese Ressource kann dir helfen, sicher zu sein, dass du das Beste fÃ¼r die "
+"Community der Menschen tust, die du trainieren mÃ¶chtest."
 
 #: https//community.torproject.org/training/best-practices/
 #: (content/training/best-practices/contents+en.lrpage.body)
 msgid "Other questions to ask yourself before deciding to do a training:"
 msgstr ""
+"Weitere Fragen, die du dir stellen solltest, bevor du dich fÃ¼r ein Training "
+"entscheidest:"
 
 #: https//community.torproject.org/training/best-practices/
 #: (content/training/best-practices/contents+en.lrpage.body)
 msgid ""
 "- How will you assess the needs of your group? What needs can you meet?"
 msgstr ""
+"- Wie wirst du die BedÃ¼rfnisse deiner Gruppe einschÃ¤tzen? Welche 
BedÃ¼rfnisse"
+" kannst du erfÃ¼llen?"
 
 #: https//community.torproject.org/training/best-practices/
 #: (content/training/best-practices/contents+en.lrpage.body)
@@ -2602,12 +2620,16 @@ msgid ""
 "- How will you assess the skill level of your group? What skill levels can "
 "you teach to?"
 msgstr ""
+"- Wie wirst du das Kompetenzniveau deiner Gruppe beurteilen? Welche "
+"Fertigkeitsstufen kannst du unterrichten?"
 
 #: https//community.torproject.org/training/best-practices/
 #: (content/training/best-practices/contents+en.lrpage.body)
 msgid ""
 "Once

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

2020-03-18 Thread translation

commit 9508027dd8544693a468af3122b3f4410f85ff98
Author: Translation commit bot 
Date:   Wed Mar 18 19:50:24 2020 +


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

diff --git a/contents+it.po b/contents+it.po
index 49f44cd425..a5abf52932 100644
--- a/contents+it.po
+++ b/contents+it.po
@@ -10,9 +10,9 @@
 # Thomas Di Cristofaro , 2019
 # Luke <94lukecatell...@gmail.com>, 2019
 # fabio carletti , 2019
-# Davide Sant , 2019
 # Emma Peel, 2020
 # Random_R, 2020
+# Davide Sant , 2020
 # 
 msgid ""
 msgstr ""
@@ -20,7 +20,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-01-15 15:58+CET\n"
 "PO-Revision-Date: 2018-11-14 12:31+\n"
-"Last-Translator: Random_R, 2020\n"
+"Last-Translator: Davide Sant , 2020\n"
 "Language-Team: Italian (https://www.transifex.com/otf/teams/1519/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -800,12 +800,12 @@ msgstr ""
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)
 msgid ""
-msgstr ""
+msgstr ""
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)
 msgid ""
-msgstr ""
+msgstr ""
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)
@@ -1540,6 +1540,8 @@ msgid ""
 "You can do this by increasing Tor Browser's Security Levels in the shield "
 "menu."
 msgstr ""
+"Puoi farlo incrementando i livelli di sicurezza del browser Tor tramite il "
+"menu Impostazioni."
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
@@ -1988,6 +1990,13 @@ msgid ""
 " displaying correctly, so Tor Browserâs default setting is to allow all "
 "websites to run scripts in \"Standard\" mode."
 msgstr ""
+"Gli utenti che richiedono un alto livello di sicurezza durante la "
+"navigazione dovrebbero impostare il [Livello di sicurezza](../security-"
+"settings/) di Tor Browser a âSicuroâ (che disattiva JavaScript per i siti 
"
+"non-HTTPS) o \"Molto sicuro\" (che lo fa per tutti i siti). Tuttavia, "
+"disattivando JavaScript alcuni siti potrebbero avere problemi di "
+"visualizzazione, per cui le impostazioni predefinite di Tor Browser "
+"permettono a tutti i siti di eseguire script in modalitÃ  \"Standard\"."
 
 #: https//tb-manual.torproject.org/plugins/
 #: (content/plugins/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

2020-03-18 Thread translation

commit af8801737bb937c990a7f7a4ff4d34248e8c1660
Author: Translation commit bot 
Date:   Wed Mar 18 19:50:07 2020 +

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

diff --git a/contents+it.po b/contents+it.po
index 0095962290..a5abf52932 100644
--- a/contents+it.po
+++ b/contents+it.po
@@ -10,9 +10,9 @@
 # Thomas Di Cristofaro , 2019
 # Luke <94lukecatell...@gmail.com>, 2019
 # fabio carletti , 2019
-# Davide Sant , 2019
 # Emma Peel, 2020
 # Random_R, 2020
+# Davide Sant , 2020
 # 
 msgid ""
 msgstr ""
@@ -20,7 +20,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-01-15 15:58+CET\n"
 "PO-Revision-Date: 2018-11-14 12:31+\n"
-"Last-Translator: Random_R, 2020\n"
+"Last-Translator: Davide Sant , 2020\n"
 "Language-Team: Italian (https://www.transifex.com/otf/teams/1519/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -1991,9 +1991,9 @@ msgid ""
 "websites to run scripts in \"Standard\" mode."
 msgstr ""
 "Gli utenti che richiedono un alto livello di sicurezza durante la "
-"navigazione dovrebbero impostare il [Livello di sicurezza](/it/security-"
-"slider) di Tor Browser a âSicuroâ (che disattiva JavaScript per i siti 
non-"
-"HTTPS) o \"Molto sicuro\" (che lo fa per tutti i siti). Tuttavia, "
+"navigazione dovrebbero impostare il [Livello di sicurezza](../security-"
+"settings/) di Tor Browser a âSicuroâ (che disattiva JavaScript per i siti 
"
+"non-HTTPS) o \"Molto sicuro\" (che lo fa per tutti i siti). Tuttavia, "
 "disattivando JavaScript alcuni siti potrebbero avere problemi di "
 "visualizzazione, per cui le impostazioni predefinite di Tor Browser "
 "permettono a tutti i siti di eseguire script in modalitÃ  \"Standard\"."

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

[tor-commits] [gettor/master] Update setup.py and requirements.txt

2020-03-18 Thread cohosh

commit bd227cfc7544c0578349aa89c6943ada0d1ab96a
Author: Cecylia Bocovich 
Date:   Fri Feb 14 22:22:52 2020 -0500

Update setup.py and requirements.txt
---
 AUTHORS  |  4 ++--
 requirements.txt | 30 +-
 setup.py | 33 ++---
 3 files changed, 57 insertions(+), 10 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 61a2e09..fd015fc 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,8 +1,9 @@
 Current maintainer/core developers:
 hiro   
-Israel Leiva   4096R/540BFC0E
+Cecylia Bocovich   
 
 Past core developers:
+Israel Leiva   4096R/540BFC0E
 Jacob Appelbaum
 Christian Fromme   
 
@@ -14,4 +15,3 @@ Contributors:
 Sukhbir Singh  4096R/B297B391
 Aaron Gibson
 Donncha O'Cearbhaill
-Cecylia Bocovich   
diff --git a/requirements.txt b/requirements.txt
index fc786a5..c5e1a69 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,6 +1,26 @@
-service_identity==18.1.0
-pydkim==0.3
-pyopenssl==19.0.0
+attrs==19.3.0
+Automat==0.8.0
+certifi==2019.11.28
+chardet==3.0.4
+constantly==15.1.0
+dkimpy==1.0.3
 dnspython==1.16.0
-twisted==19.2.1
-requests_oauthlib=1.0.0
+-e 
git+...@git-rw.torproject.org:gettor.git@3d6fb34e712f97d646b7502e62f6b6aba8a5382c#egg=gettor
+hyperlink==19.0.0
+idna==2.8
+incremental==17.5.0
+more-itertools==8.2.0
+oauthlib==3.1.0
+packaging==20.1
+pluggy==0.13.1
+py==1.8.1
+PyHamcrest==2.0.0
+pyparsing==2.4.6
+pytest==5.3.5
+requests==2.22.0
+requests-oauthlib==1.3.0
+six==1.14.0
+Twisted==19.10.0
+urllib3==1.25.8
+wcwidth==0.1.8
+zope.interface==4.7.1
diff --git a/setup.py b/setup.py
index 95cb880..70bdb6e 100644
--- a/setup.py
+++ b/setup.py
@@ -1,11 +1,38 @@
-# -*- coding: utf-8 -*-
+#!/usr/bin/env python3
 """
 This file is part of GetTor, a service providing alternative methods to 
download
 the Tor Browser.
 
 :authors: Hiro 
+  Cecylia Bocovich 
   please also see AUTHORS file
-:copyright: (c) 2008-2014, The Tor Project, Inc.
-(c) 2014, all entities within the AUTHORS file
+:copyright: (c) 2008-2020, The Tor Project, Inc.
+(c) 2020, all entities within the AUTHORS file
 :license: see included LICENSE for information
 """
+import setuptools
+
+setuptools.setup(
+name='gettor',
+version='0.0.1',
+description='Backend system for distributing Tor Browser downloads',
+author='Israel Leiva',
+author_email='i...@torproject.org',
+maintainer='Cecylia Bocovich',
+maintainer_email='coh...@torproject.org',
+url='https://gettor.torproject.org',
+download_url='https://gitweb.torproject.org/gettor.git',
+package_dir={'gettor': 'gettor'},
+packages=setuptools.find_packages(),
+scripts=['scripts/add_links_to_db',
+ 'scripts/create_db',
+ 'scripts/export_stats',
+ 'scripts/process_email',
+ 'scripts/update_files',
+ 'scripts/update_git'],
+install_requires=['twisted',
+  'pytest',
+  'requests_oauthlib',
+  'dkimpy'],
+)
+

___
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

2020-03-18 Thread translation

commit 42786d05cba1a380f767890f5e8670981f169d30
Author: Translation commit bot 
Date:   Wed Mar 18 16:21:20 2020 +


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

diff --git a/contents+fr.po b/contents+fr.po
new file mode 100644
index 00..5de326ab36
--- /dev/null
+++ b/contents+fr.po
@@ -0,0 +1,2634 @@
+# Translators:
+# Curtis Baltimore , 2019
+# Nicolas Perraut , 2019
+# erinm, 2019
+# Emma Peel, 2020
+# AO , 2020
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-01-15 15:58+CET\n"
+"PO-Revision-Date: 2018-11-14 12:31+\n"
+"Last-Translator: AO , 2020\n"
+"Language-Team: French (https://www.transifex.com/otf/teams/1519/fr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fr\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: https//tb-manual.torproject.org/ (content/contents+en.lrshowcase.title)
+msgid "Tor Browser User Manual"
+msgstr "Guide dâutilisation du NavigateurÂ Tor"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "About"
+msgstr "Ã propos"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Documentation"
+msgstr "Documentation"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Press"
+msgstr "Presse"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Blog"
+msgstr "Blogue"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Newsletter"
+msgstr "Lettre dâinformation"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Support"
+msgstr "Assistance"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Community"
+msgstr "CommunautÃ©"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Contact"
+msgstr "Contact"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Jobs"
+msgstr "Emplois"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "About Tor Browser"
+msgstr "Ã propos du NavigateurÂ Tor"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Downloading"
+msgstr "TÃ©lÃ©chargement"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Running Tor Browser for the first time"
+msgstr "Premier lancement du NavigateurÂ TorÂ "
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Pluggable transports"
+msgstr "Transports enfichables"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Circumvention"
+msgstr "Contournement"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Bridges"
+msgstr "Ponts"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Managing identities"
+msgstr "GÃ©rer les identitÃ©s"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Onion Services"
+msgstr "Services onion"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Secure Connections"
+msgstr "Connexions sÃ©curisÃ©es"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Security Settings"
+msgstr "ParamÃ¨tres de sÃ©curitÃ©"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Updating"
+msgstr "Mise Ã  jour"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Plugins"
+msgstr "Greffons"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Troubleshooting"
+msgstr "DÃ©pannage"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Uninstalling"
+msgstr "DÃ©sinstallation"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+#: https//tb-manual.torproject.org/known-issues/
+#: (content/known-issues/contents+en.lrtopic.description)
+msgid "Known issues"
+msgstr "ProblÃ¨mes connus"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Becoming a Tor Translator"
+msgstr "Devenir traducteur de Tor"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Making Tor Browser portable"
+msgstr "Rendre le NavigateurÂ Tor portable."
+
+#: https//tb-manual.torproject.org/menu/
+#:

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

2020-03-18 Thread nickm

commit e05304902c616c41b9520e2b7730e399401b68fe
Merge: 93ed011a2 cb69a5a11
Author: Nick Mathewson 
Date:   Wed Mar 18 12:18:31 2020 -0400

Merge branch 'maint-0.4.1' into release-0.4.1

 configure.ac| 4 ++--
 contrib/win32build/tor-mingw.nsi.in | 2 +-
 src/win32/orconfig.h| 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

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

[tor-commits] [tor/release-0.4.3] Merge branch 'maint-0.4.1' into maint-0.4.2

2020-03-18 Thread nickm

commit 190cda0e2ba2faa300758f4899a6c28de6886bfc
Merge: a17f4b11b cb69a5a11
Author: Nick Mathewson 
Date:   Wed Mar 18 12:17:11 2020 -0400

Merge branch 'maint-0.4.1' into maint-0.4.2

"ours" to avoid version bump.




___
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.3] Merge branch 'maint-0.4.2' into maint-0.4.3

2020-03-18 Thread nickm

commit d925d2995c6b11e4fea3a0637544c23b0b90ff95
Merge: 84f57b69f 190cda0e2
Author: Nick Mathewson 
Date:   Wed Mar 18 12:17:20 2020 -0400

Merge branch 'maint-0.4.2' into maint-0.4.3

"ours" to avoid version bump.




___
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

2020-03-18 Thread translation

commit 151f64c58785b614cbe010d237aea328141e85a0
Author: Translation commit bot 
Date:   Wed Mar 18 16:20:59 2020 +

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

diff --git a/contents+fr.po b/contents+fr.po
index 326ce3eda8..5de326ab36 100644
--- a/contents+fr.po
+++ b/contents+fr.po
@@ -1746,11 +1746,13 @@ msgid ""
 "When you are prompted to update Tor Browser, click on hamburger menu (main "
 "menu), then select âRestart to update Tor browserâ."
 msgstr ""
+"Si lâon vous demande de mettre Ã  jour le Navigateur Tor, cliquez sur le 
menu"
+" â¡, puis sur Â«Â RedÃ©marrer pour mettre Ã  jour le NavigateurÂ TorÂ Â»."
 
 #: https//tb-manual.torproject.org/updating/
 #: (content/updating/contents+en.lrtopic.body)
 msgid ""
-msgstr ""
+msgstr ""
 
 #: https//tb-manual.torproject.org/updating/
 #: (content/updating/contents+en.lrtopic.body)
@@ -1758,6 +1760,8 @@ msgid ""
 "Wait for the update to download and install, then Tor Browser will restart "
 "itself. You will now be running the latest version."
 msgstr ""
+"Attendez la fin du tÃ©lÃ©chargement et de lâinstallation, puis le 
NavigateurÂ "
+"Tor redÃ©marrera. Vous utiliserez alors la version la plus rÃ©cente."
 
 #: https//tb-manual.torproject.org/updating/
 #: (content/updating/contents+en.lrtopic.body)
@@ -1980,6 +1984,11 @@ msgid ""
 "control the JavaScript (and other scripts) that runs on individual web "
 "pages, or block it entirely."
 msgstr ""
+"Le NavigateurÂ Tor comprend une extension appelÃ©e NoScript. Vous pouvez y "
+"accÃ©der par le menu â¡, Â«Â PrÃ©fÃ©rencesÂ Â», puis en sÃ©lectionnant Â«Â "
+"PersonnaliserÂ Â» et en glissant lâicÃ´ne Â«Â SÂ Â» en haut Ã  droite de la 
fenÃªtre."
+" NoScript vous permet de contrÃ´ler le JavaScript (et autres scripts) 
exÃ©cutÃ©"
+" par les diffÃ©rentes pages Web, ou de le bloquer complÃ¨tement. "
 
 #: https//tb-manual.torproject.org/plugins/
 #: (content/plugins/contents+en.lrtopic.body)
@@ -1991,6 +2000,14 @@ msgid ""
 " displaying correctly, so Tor Browserâs default setting is to allow all "
 "websites to run scripts in \"Standard\" mode."
 msgstr ""
+"Les utilisateurs qui exigent un niveau de sÃ©curitÃ© Ã©levÃ© quand ils "
+"parcourent le Web devraient rÃ©gler [le niveau de sÃ©curitÃ©](/fr/security-"
+"settings/) du NavigateurÂ Tor Ã  Â«Â Plus sÃ»rÂ Â» (ce qui dÃ©sactive le 
JavaScript "
+"pour les sites Web non HTTPS) ou Â«Â Le plus sÃ»rÂ Â» (ce qui le fait pour 
tous "
+"les sites Web). Cependant, la dÃ©sactivation de JavaScript empÃªchera de "
+"nombreux sites Web de sâafficher correctement, et câest pourquoi le "
+"paramÃ¨tre par dÃ©faut du NavigateurÂ Tor permet Ã  tous les sites Web "
+"dâexÃ©cuter des scripts en mode Â«Â NormalÂ Â»."
 
 #: https//tb-manual.torproject.org/plugins/
 #: (content/plugins/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] [tor/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5

2020-03-18 Thread nickm

commit e065f08fe8bca501fdec0bfb91ae4270fa5c7ed6
Merge: 87fca6995 3150c3035
Author: Nick Mathewson 
Date:   Wed Mar 18 12:18:31 2020 -0400

Merge branch 'maint-0.3.5' into release-0.3.5

 configure.ac| 2 +-
 contrib/win32build/tor-mingw.nsi.in | 2 +-
 src/win32/orconfig.h| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

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

[tor-commits] [tor/release-0.4.2] Merge branch 'maint-0.3.5' into maint-0.4.1

2020-03-18 Thread nickm

commit cb69a5a1184e1b02523308c6d51b0f8f715f064e
Merge: efdbf4243 3150c3035
Author: Nick Mathewson 
Date:   Wed Mar 18 12:16:59 2020 -0400

Merge branch 'maint-0.3.5' into maint-0.4.1

"ours" to avoid version bump.




___
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.3] Merge branch 'maint-0.3.5' into maint-0.4.1

2020-03-18 Thread nickm

commit cb69a5a1184e1b02523308c6d51b0f8f715f064e
Merge: efdbf4243 3150c3035
Author: Nick Mathewson 
Date:   Wed Mar 18 12:16:59 2020 -0400

Merge branch 'maint-0.3.5' into maint-0.4.1

"ours" to avoid version bump.




___
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.2] Bump version to 0.4.1.9-dev

2020-03-18 Thread nickm

commit efdbf42432b325ef5638a1f005cd77c6b4645d20
Author: Nick Mathewson 
Date:   Wed Mar 18 12:15:53 2020 -0400

Bump version to 0.4.1.9-dev
---
 configure.ac| 4 ++--
 contrib/win32build/tor-mingw.nsi.in | 2 +-
 src/win32/orconfig.h| 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index 1d6b8ee15..628811e53 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.4.1.9])
+AC_INIT([tor],[0.4.1.9-dev])
 AC_CONFIG_SRCDIR([src/app/main/tor_main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
@@ -14,7 +14,7 @@ AC_CONFIG_MACRO_DIR([m4])
 # version number changes.  Tor uses it to make sure that it
 # only shuts down for missing "required protocols" when those protocols
 # are listed as required by a consensus after this date.
-AC_DEFINE(APPROX_RELEASE_DATE, ["2020-03-13"], # for 0.4.1.9
+AC_DEFINE(APPROX_RELEASE_DATE, ["2020-03-18"], # for 0.4.1.9-dev
   [Approximate date when this software was released. (Updated when the 
version changes.)])
 
 # "foreign" means we don't follow GNU package layout standards
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index 01f5a5740..0de3d0954 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.4.1.9"
+!define VERSION "0.4.1.9-dev"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index 9e5d1d47c..efd898681 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.4.1.9"
+#define VERSION "0.4.1.9-dev"
 
 
 



___
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.3] Bump version to 0.4.2.7-dev

2020-03-18 Thread nickm

commit a17f4b11b48c619c4cafc030b237f4b3cada79a6
Author: Nick Mathewson 
Date:   Wed Mar 18 12:16:11 2020 -0400

Bump version to 0.4.2.7-dev
---
 configure.ac| 4 ++--
 contrib/win32build/tor-mingw.nsi.in | 2 +-
 src/win32/orconfig.h| 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index 5c8b49b79..21b55d79c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.4.2.7])
+AC_INIT([tor],[0.4.2.7-dev])
 AC_CONFIG_SRCDIR([src/app/main/tor_main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
@@ -14,7 +14,7 @@ AC_CONFIG_MACRO_DIR([m4])
 # version number changes.  Tor uses it to make sure that it
 # only shuts down for missing "required protocols" when those protocols
 # are listed as required by a consensus after this date.
-AC_DEFINE(APPROX_RELEASE_DATE, ["2020-03-13"], # for 0.4.2.7
+AC_DEFINE(APPROX_RELEASE_DATE, ["2020-03-18"], # for 0.4.2.7-dev
   [Approximate date when this software was released. (Updated when the 
version changes.)])
 
 # "foreign" means we don't follow GNU package layout standards
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index 4aabd72e2..7bd274f09 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.4.2.7"
+!define VERSION "0.4.2.7-dev"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index 41dec20b9..f5f704675 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.4.2.7"
+#define VERSION "0.4.2.7-dev"
 
 
 



___
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.3] Bump version to 0.3.5.10-dev

2020-03-18 Thread nickm

commit 3150c3035150924cc10a3edf9b1b44cc1aafa257
Author: Nick Mathewson 
Date:   Wed Mar 18 12:15:32 2020 -0400

Bump version to 0.3.5.10-dev
---
 configure.ac| 2 +-
 contrib/win32build/tor-mingw.nsi.in | 2 +-
 src/win32/orconfig.h| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index da158eb23..bc434ed83 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.3.5.10])
+AC_INIT([tor],[0.3.5.10-dev])
 AC_CONFIG_SRCDIR([src/app/main/tor_main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index 8f5f38963..7252e7eb7 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.3.5.10"
+!define VERSION "0.3.5.10-dev"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index 42e3e1a4c..2b21abe88 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.3.5.10"
+#define VERSION "0.3.5.10-dev"
 
 
 



___
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.2] Merge branch 'maint-0.4.2' into release-0.4.2

2020-03-18 Thread nickm

commit 96a8773f0d0da751e58b5460b23adf26006c2618
Merge: 74cad1469 190cda0e2
Author: Nick Mathewson 
Date:   Wed Mar 18 12:18:31 2020 -0400

Merge branch 'maint-0.4.2' into release-0.4.2

 configure.ac| 4 ++--
 contrib/win32build/tor-mingw.nsi.in | 2 +-
 src/win32/orconfig.h| 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

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

[tor-commits] [tor/release-0.4.1] Bump version to 0.3.5.10-dev

2020-03-18 Thread nickm

commit 3150c3035150924cc10a3edf9b1b44cc1aafa257
Author: Nick Mathewson 
Date:   Wed Mar 18 12:15:32 2020 -0400

Bump version to 0.3.5.10-dev
---
 configure.ac| 2 +-
 contrib/win32build/tor-mingw.nsi.in | 2 +-
 src/win32/orconfig.h| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index da158eb23..bc434ed83 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.3.5.10])
+AC_INIT([tor],[0.3.5.10-dev])
 AC_CONFIG_SRCDIR([src/app/main/tor_main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index 8f5f38963..7252e7eb7 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.3.5.10"
+!define VERSION "0.3.5.10-dev"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index 42e3e1a4c..2b21abe88 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.3.5.10"
+#define VERSION "0.3.5.10-dev"
 
 
 



___
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.1] Merge branch 'maint-0.3.5' into maint-0.4.1

2020-03-18 Thread nickm

commit cb69a5a1184e1b02523308c6d51b0f8f715f064e
Merge: efdbf4243 3150c3035
Author: Nick Mathewson 
Date:   Wed Mar 18 12:16:59 2020 -0400

Merge branch 'maint-0.3.5' into maint-0.4.1

"ours" to avoid version bump.




___
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.3] Bump version to 0.4.1.9-dev

2020-03-18 Thread nickm

commit efdbf42432b325ef5638a1f005cd77c6b4645d20
Author: Nick Mathewson 
Date:   Wed Mar 18 12:15:53 2020 -0400

Bump version to 0.4.1.9-dev
---
 configure.ac| 4 ++--
 contrib/win32build/tor-mingw.nsi.in | 2 +-
 src/win32/orconfig.h| 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index 1d6b8ee15..628811e53 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.4.1.9])
+AC_INIT([tor],[0.4.1.9-dev])
 AC_CONFIG_SRCDIR([src/app/main/tor_main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
@@ -14,7 +14,7 @@ AC_CONFIG_MACRO_DIR([m4])
 # version number changes.  Tor uses it to make sure that it
 # only shuts down for missing "required protocols" when those protocols
 # are listed as required by a consensus after this date.
-AC_DEFINE(APPROX_RELEASE_DATE, ["2020-03-13"], # for 0.4.1.9
+AC_DEFINE(APPROX_RELEASE_DATE, ["2020-03-18"], # for 0.4.1.9-dev
   [Approximate date when this software was released. (Updated when the 
version changes.)])
 
 # "foreign" means we don't follow GNU package layout standards
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index 01f5a5740..0de3d0954 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.4.1.9"
+!define VERSION "0.4.1.9-dev"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index 9e5d1d47c..efd898681 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.4.1.9"
+#define VERSION "0.4.1.9-dev"
 
 
 



___
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.2] Bump version to 0.3.5.10-dev

2020-03-18 Thread nickm

commit 3150c3035150924cc10a3edf9b1b44cc1aafa257
Author: Nick Mathewson 
Date:   Wed Mar 18 12:15:32 2020 -0400

Bump version to 0.3.5.10-dev
---
 configure.ac| 2 +-
 contrib/win32build/tor-mingw.nsi.in | 2 +-
 src/win32/orconfig.h| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index da158eb23..bc434ed83 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.3.5.10])
+AC_INIT([tor],[0.3.5.10-dev])
 AC_CONFIG_SRCDIR([src/app/main/tor_main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index 8f5f38963..7252e7eb7 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.3.5.10"
+!define VERSION "0.3.5.10-dev"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index 42e3e1a4c..2b21abe88 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.3.5.10"
+#define VERSION "0.3.5.10-dev"
 
 
 



___
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.3] Merge branch 'maint-0.4.3' into release-0.4.3

2020-03-18 Thread nickm

commit 1e9e3e3eac2efeeac94fe832941b40701070ce14
Merge: 27cc9093a d925d2995
Author: Nick Mathewson 
Date:   Wed Mar 18 12:18:31 2020 -0400

Merge branch 'maint-0.4.3' into release-0.4.3

___
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.3.5' into maint-0.4.1

2020-03-18 Thread nickm

commit cb69a5a1184e1b02523308c6d51b0f8f715f064e
Merge: efdbf4243 3150c3035
Author: Nick Mathewson 
Date:   Wed Mar 18 12:16:59 2020 -0400

Merge branch 'maint-0.3.5' into maint-0.4.1

"ours" to avoid version bump.




___
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.2] Merge branch 'maint-0.4.1' into maint-0.4.2

2020-03-18 Thread nickm

commit 190cda0e2ba2faa300758f4899a6c28de6886bfc
Merge: a17f4b11b cb69a5a11
Author: Nick Mathewson 
Date:   Wed Mar 18 12:17:11 2020 -0400

Merge branch 'maint-0.4.1' into maint-0.4.2

"ours" to avoid version bump.




___
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.3'

2020-03-18 Thread nickm

commit 9b307664512ed695108a3bf890ec3d14baa86b1f
Merge: 7793ccdee d925d2995
Author: Nick Mathewson 
Date:   Wed Mar 18 12:17:32 2020 -0400

Merge branch 'maint-0.4.3'

"ours" to avoid version bump.

___
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.2] Bump version to 0.4.2.7-dev

2020-03-18 Thread nickm

commit a17f4b11b48c619c4cafc030b237f4b3cada79a6
Author: Nick Mathewson 
Date:   Wed Mar 18 12:16:11 2020 -0400

Bump version to 0.4.2.7-dev
---
 configure.ac| 4 ++--
 contrib/win32build/tor-mingw.nsi.in | 2 +-
 src/win32/orconfig.h| 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index 5c8b49b79..21b55d79c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.4.2.7])
+AC_INIT([tor],[0.4.2.7-dev])
 AC_CONFIG_SRCDIR([src/app/main/tor_main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
@@ -14,7 +14,7 @@ AC_CONFIG_MACRO_DIR([m4])
 # version number changes.  Tor uses it to make sure that it
 # only shuts down for missing "required protocols" when those protocols
 # are listed as required by a consensus after this date.
-AC_DEFINE(APPROX_RELEASE_DATE, ["2020-03-13"], # for 0.4.2.7
+AC_DEFINE(APPROX_RELEASE_DATE, ["2020-03-18"], # for 0.4.2.7-dev
   [Approximate date when this software was released. (Updated when the 
version changes.)])
 
 # "foreign" means we don't follow GNU package layout standards
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index 4aabd72e2..7bd274f09 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.4.2.7"
+!define VERSION "0.4.2.7-dev"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index 41dec20b9..f5f704675 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.4.2.7"
+#define VERSION "0.4.2.7-dev"
 
 
 



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

[tor-commits] [tor/master] Bump version to 0.3.5.10-dev

2020-03-18 Thread nickm

commit 3150c3035150924cc10a3edf9b1b44cc1aafa257
Author: Nick Mathewson 
Date:   Wed Mar 18 12:15:32 2020 -0400

Bump version to 0.3.5.10-dev
---
 configure.ac| 2 +-
 contrib/win32build/tor-mingw.nsi.in | 2 +-
 src/win32/orconfig.h| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index da158eb23..bc434ed83 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.3.5.10])
+AC_INIT([tor],[0.3.5.10-dev])
 AC_CONFIG_SRCDIR([src/app/main/tor_main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index 8f5f38963..7252e7eb7 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.3.5.10"
+!define VERSION "0.3.5.10-dev"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index 42e3e1a4c..2b21abe88 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.3.5.10"
+#define VERSION "0.3.5.10-dev"
 
 
 



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

[tor-commits] [tor/master] Bump version to 0.4.2.7-dev

2020-03-18 Thread nickm

commit a17f4b11b48c619c4cafc030b237f4b3cada79a6
Author: Nick Mathewson 
Date:   Wed Mar 18 12:16:11 2020 -0400

Bump version to 0.4.2.7-dev
---
 configure.ac| 4 ++--
 contrib/win32build/tor-mingw.nsi.in | 2 +-
 src/win32/orconfig.h| 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index 5c8b49b79..21b55d79c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.4.2.7])
+AC_INIT([tor],[0.4.2.7-dev])
 AC_CONFIG_SRCDIR([src/app/main/tor_main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
@@ -14,7 +14,7 @@ AC_CONFIG_MACRO_DIR([m4])
 # version number changes.  Tor uses it to make sure that it
 # only shuts down for missing "required protocols" when those protocols
 # are listed as required by a consensus after this date.
-AC_DEFINE(APPROX_RELEASE_DATE, ["2020-03-13"], # for 0.4.2.7
+AC_DEFINE(APPROX_RELEASE_DATE, ["2020-03-18"], # for 0.4.2.7-dev
   [Approximate date when this software was released. (Updated when the 
version changes.)])
 
 # "foreign" means we don't follow GNU package layout standards
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index 4aabd72e2..7bd274f09 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.4.2.7"
+!define VERSION "0.4.2.7-dev"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index 41dec20b9..f5f704675 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.4.2.7"
+#define VERSION "0.4.2.7-dev"
 
 
 



___
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.3] Merge branch 'maint-0.3.5' into maint-0.4.1

2020-03-18 Thread nickm

commit cb69a5a1184e1b02523308c6d51b0f8f715f064e
Merge: efdbf4243 3150c3035
Author: Nick Mathewson 
Date:   Wed Mar 18 12:16:59 2020 -0400

Merge branch 'maint-0.3.5' into maint-0.4.1

"ours" to avoid version bump.




___
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.3] Bump version to 0.4.1.9-dev

2020-03-18 Thread nickm

commit efdbf42432b325ef5638a1f005cd77c6b4645d20
Author: Nick Mathewson 
Date:   Wed Mar 18 12:15:53 2020 -0400

Bump version to 0.4.1.9-dev
---
 configure.ac| 4 ++--
 contrib/win32build/tor-mingw.nsi.in | 2 +-
 src/win32/orconfig.h| 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index 1d6b8ee15..628811e53 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.4.1.9])
+AC_INIT([tor],[0.4.1.9-dev])
 AC_CONFIG_SRCDIR([src/app/main/tor_main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
@@ -14,7 +14,7 @@ AC_CONFIG_MACRO_DIR([m4])
 # version number changes.  Tor uses it to make sure that it
 # only shuts down for missing "required protocols" when those protocols
 # are listed as required by a consensus after this date.
-AC_DEFINE(APPROX_RELEASE_DATE, ["2020-03-13"], # for 0.4.1.9
+AC_DEFINE(APPROX_RELEASE_DATE, ["2020-03-18"], # for 0.4.1.9-dev
   [Approximate date when this software was released. (Updated when the 
version changes.)])
 
 # "foreign" means we don't follow GNU package layout standards
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index 01f5a5740..0de3d0954 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.4.1.9"
+!define VERSION "0.4.1.9-dev"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index 9e5d1d47c..efd898681 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.4.1.9"
+#define VERSION "0.4.1.9-dev"
 
 
 



___
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.3] Bump version to 0.4.2.7-dev

2020-03-18 Thread nickm

commit a17f4b11b48c619c4cafc030b237f4b3cada79a6
Author: Nick Mathewson 
Date:   Wed Mar 18 12:16:11 2020 -0400

Bump version to 0.4.2.7-dev
---
 configure.ac| 4 ++--
 contrib/win32build/tor-mingw.nsi.in | 2 +-
 src/win32/orconfig.h| 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index 5c8b49b79..21b55d79c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.4.2.7])
+AC_INIT([tor],[0.4.2.7-dev])
 AC_CONFIG_SRCDIR([src/app/main/tor_main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
@@ -14,7 +14,7 @@ AC_CONFIG_MACRO_DIR([m4])
 # version number changes.  Tor uses it to make sure that it
 # only shuts down for missing "required protocols" when those protocols
 # are listed as required by a consensus after this date.
-AC_DEFINE(APPROX_RELEASE_DATE, ["2020-03-13"], # for 0.4.2.7
+AC_DEFINE(APPROX_RELEASE_DATE, ["2020-03-18"], # for 0.4.2.7-dev
   [Approximate date when this software was released. (Updated when the 
version changes.)])
 
 # "foreign" means we don't follow GNU package layout standards
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index 4aabd72e2..7bd274f09 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.4.2.7"
+!define VERSION "0.4.2.7-dev"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index 41dec20b9..f5f704675 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.4.2.7"
+#define VERSION "0.4.2.7-dev"
 
 
 



___
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.3] Merge branch 'maint-0.4.2' into maint-0.4.3

2020-03-18 Thread nickm

commit d925d2995c6b11e4fea3a0637544c23b0b90ff95
Merge: 84f57b69f 190cda0e2
Author: Nick Mathewson 
Date:   Wed Mar 18 12:17:20 2020 -0400

Merge branch 'maint-0.4.2' into maint-0.4.3

"ours" to avoid version bump.

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

[tor-commits] [tor/master] Bump version to 0.4.1.9-dev

2020-03-18 Thread nickm

commit efdbf42432b325ef5638a1f005cd77c6b4645d20
Author: Nick Mathewson 
Date:   Wed Mar 18 12:15:53 2020 -0400

Bump version to 0.4.1.9-dev
---
 configure.ac| 4 ++--
 contrib/win32build/tor-mingw.nsi.in | 2 +-
 src/win32/orconfig.h| 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index 1d6b8ee15..628811e53 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.4.1.9])
+AC_INIT([tor],[0.4.1.9-dev])
 AC_CONFIG_SRCDIR([src/app/main/tor_main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
@@ -14,7 +14,7 @@ AC_CONFIG_MACRO_DIR([m4])
 # version number changes.  Tor uses it to make sure that it
 # only shuts down for missing "required protocols" when those protocols
 # are listed as required by a consensus after this date.
-AC_DEFINE(APPROX_RELEASE_DATE, ["2020-03-13"], # for 0.4.1.9
+AC_DEFINE(APPROX_RELEASE_DATE, ["2020-03-18"], # for 0.4.1.9-dev
   [Approximate date when this software was released. (Updated when the 
version changes.)])
 
 # "foreign" means we don't follow GNU package layout standards
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index 01f5a5740..0de3d0954 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.4.1.9"
+!define VERSION "0.4.1.9-dev"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index 9e5d1d47c..efd898681 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.4.1.9"
+#define VERSION "0.4.1.9-dev"
 
 
 



___
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.3] Bump version to 0.3.5.10-dev

2020-03-18 Thread nickm

commit 3150c3035150924cc10a3edf9b1b44cc1aafa257
Author: Nick Mathewson 
Date:   Wed Mar 18 12:15:32 2020 -0400

Bump version to 0.3.5.10-dev
---
 configure.ac| 2 +-
 contrib/win32build/tor-mingw.nsi.in | 2 +-
 src/win32/orconfig.h| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index da158eb23..bc434ed83 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.3.5.10])
+AC_INIT([tor],[0.3.5.10-dev])
 AC_CONFIG_SRCDIR([src/app/main/tor_main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index 8f5f38963..7252e7eb7 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.3.5.10"
+!define VERSION "0.3.5.10-dev"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index 42e3e1a4c..2b21abe88 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.3.5.10"
+#define VERSION "0.3.5.10-dev"
 
 
 



___
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.2] Merge branch 'maint-0.4.1' into maint-0.4.2

2020-03-18 Thread nickm

commit 190cda0e2ba2faa300758f4899a6c28de6886bfc
Merge: a17f4b11b cb69a5a11
Author: Nick Mathewson 
Date:   Wed Mar 18 12:17:11 2020 -0400

Merge branch 'maint-0.4.1' into maint-0.4.2

"ours" to avoid version bump.

___
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.1' into maint-0.4.2

2020-03-18 Thread nickm

commit 190cda0e2ba2faa300758f4899a6c28de6886bfc
Merge: a17f4b11b cb69a5a11
Author: Nick Mathewson 
Date:   Wed Mar 18 12:17:11 2020 -0400

Merge branch 'maint-0.4.1' into maint-0.4.2

"ours" to avoid version bump.




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

[tor-commits] [tor/release-0.3.5] Bump version to 0.3.5.10-dev

2020-03-18 Thread nickm

commit 3150c3035150924cc10a3edf9b1b44cc1aafa257
Author: Nick Mathewson 
Date:   Wed Mar 18 12:15:32 2020 -0400

Bump version to 0.3.5.10-dev
---
 configure.ac| 2 +-
 contrib/win32build/tor-mingw.nsi.in | 2 +-
 src/win32/orconfig.h| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index da158eb23..bc434ed83 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.3.5.10])
+AC_INIT([tor],[0.3.5.10-dev])
 AC_CONFIG_SRCDIR([src/app/main/tor_main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index 8f5f38963..7252e7eb7 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.3.5.10"
+!define VERSION "0.3.5.10-dev"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index 42e3e1a4c..2b21abe88 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.3.5.10"
+#define VERSION "0.3.5.10-dev"
 
 
 



___
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.2' into maint-0.4.3

2020-03-18 Thread nickm

commit d925d2995c6b11e4fea3a0637544c23b0b90ff95
Merge: 84f57b69f 190cda0e2
Author: Nick Mathewson 
Date:   Wed Mar 18 12:17:20 2020 -0400

Merge branch 'maint-0.4.2' into maint-0.4.3

"ours" to avoid version bump.




___
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.1] Bump version to 0.4.1.9-dev

2020-03-18 Thread nickm

commit efdbf42432b325ef5638a1f005cd77c6b4645d20
Author: Nick Mathewson 
Date:   Wed Mar 18 12:15:53 2020 -0400

Bump version to 0.4.1.9-dev
---
 configure.ac| 4 ++--
 contrib/win32build/tor-mingw.nsi.in | 2 +-
 src/win32/orconfig.h| 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index 1d6b8ee15..628811e53 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.4.1.9])
+AC_INIT([tor],[0.4.1.9-dev])
 AC_CONFIG_SRCDIR([src/app/main/tor_main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
@@ -14,7 +14,7 @@ AC_CONFIG_MACRO_DIR([m4])
 # version number changes.  Tor uses it to make sure that it
 # only shuts down for missing "required protocols" when those protocols
 # are listed as required by a consensus after this date.
-AC_DEFINE(APPROX_RELEASE_DATE, ["2020-03-13"], # for 0.4.1.9
+AC_DEFINE(APPROX_RELEASE_DATE, ["2020-03-18"], # for 0.4.1.9-dev
   [Approximate date when this software was released. (Updated when the 
version changes.)])
 
 # "foreign" means we don't follow GNU package layout standards
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index 01f5a5740..0de3d0954 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.4.1.9"
+!define VERSION "0.4.1.9-dev"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index 9e5d1d47c..efd898681 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.4.1.9"
+#define VERSION "0.4.1.9-dev"
 
 
 



___
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.3] Merge branch 'maint-0.4.1' into maint-0.4.2

2020-03-18 Thread nickm

commit 190cda0e2ba2faa300758f4899a6c28de6886bfc
Merge: a17f4b11b cb69a5a11
Author: Nick Mathewson 
Date:   Wed Mar 18 12:17:11 2020 -0400

Merge branch 'maint-0.4.1' into maint-0.4.2

"ours" to avoid version bump.




___
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.2] Bump version to 0.4.2.7-dev

2020-03-18 Thread nickm

commit a17f4b11b48c619c4cafc030b237f4b3cada79a6
Author: Nick Mathewson 
Date:   Wed Mar 18 12:16:11 2020 -0400

Bump version to 0.4.2.7-dev
---
 configure.ac| 4 ++--
 contrib/win32build/tor-mingw.nsi.in | 2 +-
 src/win32/orconfig.h| 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index 5c8b49b79..21b55d79c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.4.2.7])
+AC_INIT([tor],[0.4.2.7-dev])
 AC_CONFIG_SRCDIR([src/app/main/tor_main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
@@ -14,7 +14,7 @@ AC_CONFIG_MACRO_DIR([m4])
 # version number changes.  Tor uses it to make sure that it
 # only shuts down for missing "required protocols" when those protocols
 # are listed as required by a consensus after this date.
-AC_DEFINE(APPROX_RELEASE_DATE, ["2020-03-13"], # for 0.4.2.7
+AC_DEFINE(APPROX_RELEASE_DATE, ["2020-03-18"], # for 0.4.2.7-dev
   [Approximate date when this software was released. (Updated when the 
version changes.)])
 
 # "foreign" means we don't follow GNU package layout standards
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index 4aabd72e2..7bd274f09 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.4.2.7"
+!define VERSION "0.4.2.7-dev"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index 41dec20b9..f5f704675 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.4.2.7"
+#define VERSION "0.4.2.7-dev"
 
 
 



___
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.2] Merge branch 'maint-0.3.5' into maint-0.4.1

2020-03-18 Thread nickm

commit cb69a5a1184e1b02523308c6d51b0f8f715f064e
Merge: efdbf4243 3150c3035
Author: Nick Mathewson 
Date:   Wed Mar 18 12:16:59 2020 -0400

Merge branch 'maint-0.3.5' into maint-0.4.1

"ours" to avoid version bump.




___
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.2] Bump version to 0.4.1.9-dev

2020-03-18 Thread nickm

commit efdbf42432b325ef5638a1f005cd77c6b4645d20
Author: Nick Mathewson 
Date:   Wed Mar 18 12:15:53 2020 -0400

Bump version to 0.4.1.9-dev
---
 configure.ac| 4 ++--
 contrib/win32build/tor-mingw.nsi.in | 2 +-
 src/win32/orconfig.h| 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index 1d6b8ee15..628811e53 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.4.1.9])
+AC_INIT([tor],[0.4.1.9-dev])
 AC_CONFIG_SRCDIR([src/app/main/tor_main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
@@ -14,7 +14,7 @@ AC_CONFIG_MACRO_DIR([m4])
 # version number changes.  Tor uses it to make sure that it
 # only shuts down for missing "required protocols" when those protocols
 # are listed as required by a consensus after this date.
-AC_DEFINE(APPROX_RELEASE_DATE, ["2020-03-13"], # for 0.4.1.9
+AC_DEFINE(APPROX_RELEASE_DATE, ["2020-03-18"], # for 0.4.1.9-dev
   [Approximate date when this software was released. (Updated when the 
version changes.)])
 
 # "foreign" means we don't follow GNU package layout standards
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index 01f5a5740..0de3d0954 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.4.1.9"
+!define VERSION "0.4.1.9-dev"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index 9e5d1d47c..efd898681 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.4.1.9"
+#define VERSION "0.4.1.9-dev"
 
 
 



___
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.1] Bump version to 0.4.1.9-dev

2020-03-18 Thread nickm

commit efdbf42432b325ef5638a1f005cd77c6b4645d20
Author: Nick Mathewson 
Date:   Wed Mar 18 12:15:53 2020 -0400

Bump version to 0.4.1.9-dev
---
 configure.ac| 4 ++--
 contrib/win32build/tor-mingw.nsi.in | 2 +-
 src/win32/orconfig.h| 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index 1d6b8ee15..628811e53 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.4.1.9])
+AC_INIT([tor],[0.4.1.9-dev])
 AC_CONFIG_SRCDIR([src/app/main/tor_main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
@@ -14,7 +14,7 @@ AC_CONFIG_MACRO_DIR([m4])
 # version number changes.  Tor uses it to make sure that it
 # only shuts down for missing "required protocols" when those protocols
 # are listed as required by a consensus after this date.
-AC_DEFINE(APPROX_RELEASE_DATE, ["2020-03-13"], # for 0.4.1.9
+AC_DEFINE(APPROX_RELEASE_DATE, ["2020-03-18"], # for 0.4.1.9-dev
   [Approximate date when this software was released. (Updated when the 
version changes.)])
 
 # "foreign" means we don't follow GNU package layout standards
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index 01f5a5740..0de3d0954 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.4.1.9"
+!define VERSION "0.4.1.9-dev"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index 9e5d1d47c..efd898681 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.4.1.9"
+#define VERSION "0.4.1.9-dev"
 
 
 



___
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.1] Bump version to 0.3.5.10-dev

2020-03-18 Thread nickm

commit 3150c3035150924cc10a3edf9b1b44cc1aafa257
Author: Nick Mathewson 
Date:   Wed Mar 18 12:15:32 2020 -0400

Bump version to 0.3.5.10-dev
---
 configure.ac| 2 +-
 contrib/win32build/tor-mingw.nsi.in | 2 +-
 src/win32/orconfig.h| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index da158eb23..bc434ed83 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.3.5.10])
+AC_INIT([tor],[0.3.5.10-dev])
 AC_CONFIG_SRCDIR([src/app/main/tor_main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index 8f5f38963..7252e7eb7 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.3.5.10"
+!define VERSION "0.3.5.10-dev"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index 42e3e1a4c..2b21abe88 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.3.5.10"
+#define VERSION "0.3.5.10-dev"
 
 
 



___
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.2] Bump version to 0.3.5.10-dev

2020-03-18 Thread nickm

commit 3150c3035150924cc10a3edf9b1b44cc1aafa257
Author: Nick Mathewson 
Date:   Wed Mar 18 12:15:32 2020 -0400

Bump version to 0.3.5.10-dev
---
 configure.ac| 2 +-
 contrib/win32build/tor-mingw.nsi.in | 2 +-
 src/win32/orconfig.h| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index da158eb23..bc434ed83 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.3.5.10])
+AC_INIT([tor],[0.3.5.10-dev])
 AC_CONFIG_SRCDIR([src/app/main/tor_main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index 8f5f38963..7252e7eb7 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.3.5.10"
+!define VERSION "0.3.5.10-dev"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index 42e3e1a4c..2b21abe88 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.3.5.10"
+#define VERSION "0.3.5.10-dev"
 
 
 



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

[tor-commits] [tor/maint-0.3.5] Bump version to 0.3.5.10-dev

2020-03-18 Thread nickm

commit 3150c3035150924cc10a3edf9b1b44cc1aafa257
Author: Nick Mathewson 
Date:   Wed Mar 18 12:15:32 2020 -0400

Bump version to 0.3.5.10-dev
---
 configure.ac| 2 +-
 contrib/win32build/tor-mingw.nsi.in | 2 +-
 src/win32/orconfig.h| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index da158eb23..bc434ed83 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.3.5.10])
+AC_INIT([tor],[0.3.5.10-dev])
 AC_CONFIG_SRCDIR([src/app/main/tor_main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index 8f5f38963..7252e7eb7 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.3.5.10"
+!define VERSION "0.3.5.10-dev"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index 42e3e1a4c..2b21abe88 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.3.5.10"
+#define VERSION "0.3.5.10-dev"
 
 
 

___
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.1] Merge branch 'maint-0.3.5' into maint-0.4.1

2020-03-18 Thread nickm

commit cb69a5a1184e1b02523308c6d51b0f8f715f064e
Merge: efdbf4243 3150c3035
Author: Nick Mathewson 
Date:   Wed Mar 18 12:16:59 2020 -0400

Merge branch 'maint-0.3.5' into maint-0.4.1

"ours" to avoid version bump.

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

[tor-commits] [tpo/master] New tor releases: 0.4.2.7 and 0.4.3.3-alpha.

2020-03-18 Thread nickm

commit 39996d14c7f73bfd544c4ecd59ef79ebb68869be
Author: Nick Mathewson 
Date:   Wed Mar 18 12:09:14 2020 -0400

New tor releases: 0.4.2.7 and 0.4.3.3-alpha.
---
 databags/versions.ini | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/databags/versions.ini b/databags/versions.ini
index 477f728..fe410d0 100644
--- a/databags/versions.ini
+++ b/databags/versions.ini
@@ -6,8 +6,8 @@ win32 = 0.4.2.6
 version = 9.5a8
 
 [tor-stable]
-version = 0.4.2.6
+version = 0.4.2.7
 
 [tor-alpha]
-version = 0.4.3.2-alpha
+version = 0.4.3.3-alpha
 

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

[tor-commits] [torbutton/maint-9.0] Bug 33613 - Disable javascript on Safest security level

2020-03-18 Thread sysrqb

commit 690704a9bc3bd3a146db9689bc59d3b9e8702b15
Author: Matthew Finkel 
Date:   Fri Mar 13 21:12:16 2020 +

Bug 33613 - Disable javascript on Safest security level
---
 modules/security-prefs.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/security-prefs.js b/modules/security-prefs.js
index f61f24aa..947520fb 100644
--- a/modules/security-prefs.js
+++ b/modules/security-prefs.js
@@ -33,6 +33,7 @@ const kSecuritySettings = {
   "gfx.font_rendering.opentype_svg.enabled" : [,  false, false, false, true ],
   "svg.disabled" :[,  true,  false, false, false],
   "javascript.options.asmjs" :[,  false, false, false, true ],
+  "javascript.enabled" :  [,  false, true,  true,  true ],
 };
 
 // The Security Settings prefs in question.

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

[tor-commits] [torbutton/master] Bug 33613 - Disable javascript on Safest security level

2020-03-18 Thread sysrqb

commit 39ca6d2c09d60aa04c798410186b6443d73df0eb
Author: Matthew Finkel 
Date:   Fri Mar 13 21:08:30 2020 +

Bug 33613 - Disable javascript on Safest security level
---
 modules/security-prefs.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/security-prefs.js b/modules/security-prefs.js
index a51472e6..f6e397d4 100644
--- a/modules/security-prefs.js
+++ b/modules/security-prefs.js
@@ -35,6 +35,7 @@ const kSecuritySettings = {
   "svg.disabled" :[,  true,  false, false, false],
   "javascript.options.asmjs" :[,  false, false, false, true ],
   "javascript.options.wasm" : [,  false, false, false, true ],
+  "javascript.enabled" :  [,  false, true,  true,  true ],
 };
 
 // The Security Settings prefs in question.

___
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

2020-03-18 Thread translation

commit f535972838c337a86dc29dddb2670d75dca878a7
Author: Translation commit bot 
Date:   Wed Mar 18 15:50:43 2020 +

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

diff --git a/contents+fr.po b/contents+fr.po
index d00c6fc557..326ce3eda8 100644
--- a/contents+fr.po
+++ b/contents+fr.po
@@ -928,6 +928,9 @@ msgid ""
 " fact that you are using Tor, but may slow down the connection compared to "
 "using ordinary Tor relays."
 msgstr ""
+"Lâutilisation de ponts combinÃ©s aux transports enfichables vous aide Ã  "
+"occulter le fait que vous utilisez Tor, mais peut ralentir la connexion par "
+"rapport aux relaisÂ Tor ordinaires."
 
 #: https//tb-manual.torproject.org/bridges/
 #: (content/bridges/contents+en.lrtopic.body)
@@ -993,14 +996,16 @@ msgid ""
 "Otherwise, click on 'Preferences' in the hamburger menu (main menu) and then"
 " on 'Tor' in the sidebar."
 msgstr ""
-"Sinon, cliquez sur Â«Â PrÃ©fÃ©rencesÂ Â» dans le menu hamburger (menu 
principal), "
-"puis sur Â«Â TorÂ Â» dans la barre latÃ©rale."
+"Sinon, cliquez sur Â«Â PrÃ©fÃ©rencesÂ Â» dans le menu â¡ (menu principal), 
puis sur"
+" Â«Â TorÂ Â» dans la barre latÃ©rale."
 
 #: https//tb-manual.torproject.org/bridges/
 #: (content/bridges/contents+en.lrtopic.body)
 msgid ""
 "In the Tor Network Settings window, select 'Tor is censored in my country.'"
 msgstr ""
+"Dans la fenÃªtre ParamÃ¨tres du rÃ©seauÂ Tor, sÃ©lectionnez Â«Â Tor est 
censurÃ© "
+"dans mon paysÂ Â»."
 
 #: https//tb-manual.torproject.org/bridges/
 #: (content/bridges/contents+en.lrtopic.body)
@@ -1008,6 +1013,8 @@ msgid ""
 "Then, select 'Request a bridge from torproject.org' and click 'Request a "
 "bridge...'"
 msgstr ""
+"SÃ©lectionnez ensuite Â«Â Demander un pont Ã  torproject.orgÂ Â» et cliquez 
sur Â«Â "
+"Demander un pontâ¦Â Â»"
 
 #: https//tb-manual.torproject.org/bridges/
 #: (content/bridges/contents+en.lrtopic.body)
@@ -1047,8 +1054,8 @@ msgid ""
 msgstr ""
 "Si vous dÃ©marrez le NavigateurÂ Tor pour la premiÃ¨re fois, cliquez sur Â«Â "
 "ConfigurerÂ Â» pour ouvrir la fenÃªtre des paramÃ¨tres du rÃ©seauÂ Tor. 
Sinon, "
-"cliquez sur Â«Â PrÃ©fÃ©rencesÂ Â» dans le menu hamburger (menu principal), 
puis "
-"sur Â«Â TorÂ Â» dans la barre latÃ©rale pour accÃ©der Ã  ces options."
+"cliquez sur Â«Â PrÃ©fÃ©rencesÂ Â» dans le menu â¡ (menu principal), puis sur 
Â«Â TorÂ "
+"Â» dans la barre latÃ©rale pour accÃ©der Ã  ces options."
 
 #: https//tb-manual.torproject.org/bridges/
 #: (content/bridges/contents+en.lrtopic.body)
@@ -1275,6 +1282,8 @@ msgid ""
 "Tor Browser features âNew Identityâ and âNew Tor Circuit for this 
Siteâ "
 "options. There are also located in the main menu (hamburger menu)."
 msgstr ""
+"Le NavigateurÂ Tor propose les options Â«Â Nouvelle identitÃ©Â Â» et Â«Â 
Nouveau "
+"circuitÂ Tor pour ce siteÂ Â». Elles sont situÃ©es dans le menu principalÂ 
â¡."
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
@@ -1469,6 +1478,9 @@ msgid ""
 "You can also ensure that you're able to access other onion services by "
 "connecting to [DuckDuckGo's Onion Service](http://3g2upl4pq6kufc4m.onion/)."
 msgstr ""
+"Vous pouvez aussi vous assurer que vous arrivez Ã  accÃ©der Ã  dâautres "
+"services onion en vous connectant au [service onion de "
+"DuckDuckGo](http://3g2upl4pq6kufc4m.onion/)."
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.title)
@@ -1535,6 +1547,8 @@ msgid ""
 "You can do this by increasing Tor Browser's Security Levels in the shield "
 "menu."
 msgstr ""
+"Ã partir du menu du bouclier, vous pouvez le faire en augmentant le niveau "
+"de sÃ©curitÃ© du NavigateurÂ Tor dans les ParamÃ¨tres de sÃ©curitÃ© avancÃ©s."
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
@@ -1646,6 +1660,9 @@ msgid ""
 " fonts and math symbols are disabled; audio and video (HTML5 media) are "
 "click-to-play."
 msgstr ""
+"* JavaScript est dÃ©sactivÃ© sur tous les sites non [HTTPS](/fr/secure-"
+"connections)â; certaines polices et certains symboles mathÃ©matiques sont "
+"dÃ©sactivÃ©sâ; le son et la vidÃ©o (mÃ©diasÂ HTML5) sont Â«Â cliquer pour 
lireÂ Â»."
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/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/https_everywhere] https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere

2020-03-18 Thread translation

commit 8b8df990b9eeb9b455f4d060629ce770b866aa4f
Author: Translation commit bot 
Date:   Wed Mar 18 14:16:12 2020 +

https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere
---
 it/https-everywhere.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/it/https-everywhere.dtd b/it/https-everywhere.dtd
index 0f84aa10e2..1c213cba66 100644
--- a/it/https-everywhere.dtd
+++ b/it/https-everywhere.dtd
@@ -50,7 +50,7 @@
 
 
 
-
+
 
 
 

___
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

2020-03-18 Thread translation

commit 2bcb0e44bc5f0fce21fa2bf34d3a50f4334f67f5
Author: Translation commit bot 
Date:   Wed Mar 18 13:53:43 2020 +

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

diff --git a/contents+it.po b/contents+it.po
index da8a12f429..d97ef3fbc7 100644
--- a/contents+it.po
+++ b/contents+it.po
@@ -4,7 +4,6 @@
 # francesco ercolani , 2019
 # Hiro 7 , 2019
 # Gabriele , 2019
-# Random_R, 2019
 # Fabio Ottone, 2019
 # mattia_b89 , 2019
 # erinm, 2019
@@ -17,6 +16,7 @@
 # Emma Peel, 2020
 # Davide Sant , 2020
 # giulio marino , 2020
+# Random_R, 2020
 # 
 msgid ""
 msgstr ""
@@ -24,7 +24,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-02-27 18:30+CET\n"
 "PO-Revision-Date: 2018-10-02 22:41+\n"
-"Last-Translator: giulio marino , 2020\n"
+"Last-Translator: Random_R, 2020\n"
 "Language-Team: Italian (https://www.transifex.com/otf/teams/1519/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -133,7 +133,7 @@ msgstr "Repository Debian"
 
 #: https//support.torproject.org/rpm/ (content/rpm/contents+en.lrtopic.title)
 msgid "Tor rpm packages"
-msgstr ""
+msgstr "Pacchetti rpm di Tor"
 
 #: https//support.torproject.org/misc/glossary/
 #: (content/misc/glossary/contents+en.lrquestion.description)
@@ -327,6 +327,8 @@ msgid ""
 "Tor Browser is specifically engineered to have a nearly identical (we're not"
 " perfect!) fingerprint across its users."
 msgstr ""
+"Tor Browser Ã¨ progettato specificatamente per avere un'impronta quasi "
+"identica (non siamo perfetti!) per tutti i suoi utenti."
 
 #: https//support.torproject.org/faq/faq-3/
 #: (content/faq/faq-3/contents+en.lrquestion.description)
@@ -395,6 +397,9 @@ msgid ""
 "[article](https://blog.torproject.org/browser-fingerprinting-introduction-;
 "and-challenges-ahead) on The Tor Blog all about it."
 msgstr ""
+"Vuoi maggiori informazioni sulle impronte dei browser? Ecco un "
+"[articolo](https://blog.torproject.org/browser-fingerprinting-introduction-;
+"and-challenges-ahead) sul Blog di Tor dove ne parliamo."
 
 #: https//support.torproject.org/faq/faq-4/
 #: (content/faq/faq-4/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/https_everywhere] https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere

2020-03-18 Thread translation

commit b48fcb69fce3acc948b22b25119f66b67a819fca
Author: Translation commit bot 
Date:   Wed Mar 18 13:45:56 2020 +

https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere
---
 he/https-everywhere.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/he/https-everywhere.dtd b/he/https-everywhere.dtd
index 456493777f..9750d9448b 100644
--- a/he/https-everywhere.dtd
+++ b/he/https-everywhere.dtd
@@ -50,7 +50,7 @@
 
 
 
-
+
 
 
 

___
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.3] Merge branch 'maint-0.4.3' into release-0.4.3

2020-03-18 Thread nickm

commit d96ed976d947ca359066abe795eaf806272b
Merge: 2d47cb984 84f57b69f
Author: Nick Mathewson 
Date:   Wed Mar 18 08:20:16 2020 -0400

Merge branch 'maint-0.4.3' into release-0.4.3

 src/lib/crypt_ops/crypto_rsa_openssl.c | 7 +++
 1 file changed, 7 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.3] Merge branch 'trove_2020_002_035' into maint-0.3.5

2020-03-18 Thread nickm

commit fe3d8ec38e3c4c2a992280c2847cdd8e05f81d36
Merge: 089e57d22 f958b537a
Author: Nick Mathewson 
Date:   Tue Mar 17 15:21:48 2020 -0400

Merge branch 'trove_2020_002_035' into maint-0.3.5

 changes/ticket33119|  8 +
 src/feature/dirparse/parsecommon.c |  9 -
 src/lib/crypt_ops/crypto_rsa.c | 27 +++
 src/lib/crypt_ops/crypto_rsa.h |  5 ++-
 src/lib/crypt_ops/crypto_rsa_nss.c | 14 +++-
 src/lib/crypt_ops/crypto_rsa_openssl.c | 63 --
 src/test/test_crypto.c | 39 +
 7 files changed, 154 insertions(+), 11 deletions(-)



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

[tor-commits] [tor/release-0.4.3] Extract key length check into a new function, and check more fields.

2020-03-18 Thread nickm

commit 8abdb394893a1704f885278f5f5d7913cdf516c9
Author: Nick Mathewson 
Date:   Tue Mar 17 10:04:38 2020 -0400

Extract key length check into a new function, and check more fields.

In the openssl that I have, it should be safe to only check the size
of n.  But if I'm wrong, or if other openssls work differently, we
should check whether any of the fields are too large.

Issue spotted by Teor.
---
 src/lib/crypt_ops/crypto_rsa_openssl.c | 57 +++---
 1 file changed, 52 insertions(+), 5 deletions(-)

diff --git a/src/lib/crypt_ops/crypto_rsa_openssl.c 
b/src/lib/crypt_ops/crypto_rsa_openssl.c
index 0db25f347..6f3ac6fde 100644
--- a/src/lib/crypt_ops/crypto_rsa_openssl.c
+++ b/src/lib/crypt_ops/crypto_rsa_openssl.c
@@ -33,6 +33,7 @@ ENABLE_GCC_WARNING(redundant-decls)
 #include "lib/encoding/binascii.h"
 
 #include 
+#include 
 
 /** Declaration for crypto_pk_t structure. */
 struct crypto_pk_t
@@ -564,6 +565,56 @@ crypto_pk_asn1_encode_private(const crypto_pk_t *pk, char 
*dest,
   return len;
 }
 
+/** Check whether any component of a private key is too large in a way that
+ * seems likely to make verification too expensive. Return true if it's too
+ * long, and false otherwise. */
+static bool
+rsa_private_key_too_long(RSA *rsa, int max_bits)
+{
+  const BIGNUM *n, *e, *p, *q, *d, *dmp1, *dmq1, *iqmp;
+#ifdef OPENSSL_1_1_API
+  n = RSA_get0_n(rsa);
+  e = RSA_get0_e(rsa);
+  p = RSA_get0_p(rsa);
+  q = RSA_get0_q(rsa);
+  d = RSA_get0_d(rsa);
+  dmp1 = RSA_get0_dmp1(rsa);
+  dmq1 = RSA_get0_dmq1(rsa);
+  iqmp = RSA_get0_iqmp(rsa);
+
+  if (RSA_bits(rsa) > max_bits)
+return true;
+#else
+  n = rsa->n;
+  e = rsa->e;
+  p = rsa->p;
+  q = rsa->q;
+  d = rsa->d;
+  dmp1 = rsa->dmp1;
+  dmq1 = rsa->dmq1;
+  iqmp = rsa->iqmp;
+#endif
+
+  if (n && BN_num_bits(n) > max_bits)
+return true;
+  if (e && BN_num_bits(e) > max_bits)
+return true;
+  if (p && BN_num_bits(p) > max_bits)
+return true;
+  if (q && BN_num_bits(q) > max_bits)
+return true;
+  if (d && BN_num_bits(d) > max_bits)
+return true;
+  if (dmp1 && BN_num_bits(dmp1) > max_bits)
+return true;
+  if (dmq1 && BN_num_bits(dmq1) > max_bits)
+return true;
+  if (iqmp && BN_num_bits(iqmp) > max_bits)
+return true;
+
+  return false;
+}
+
 /** Decode an ASN.1-encoded private key from str; return the result on
  * success and NULL on failure.
  *
@@ -584,11 +635,7 @@ crypto_pk_asn1_decode_private(const char *str, size_t len, 
int max_bits)
 crypto_openssl_log_errors(LOG_WARN,"decoding private key");
 return NULL;
   }
-#ifdef OPENSSL_1_1_API
-  if (max_bits >= 0 && RSA_bits(rsa) > max_bits) {
-#else
-  if (max_bits >= 0 && rsa->n && BN_num_bits(rsa->n) > max_bits) {
-#endif
+  if (max_bits >= 0 && rsa_private_key_too_long(rsa, max_bits)) {
 log_info(LD_CRYPTO, "Private key longer than expected.");
 RSA_free(rsa);
 return NULL;



___
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.3] Merge branch 'trove_2020_002_041' into maint-0.4.1

2020-03-18 Thread nickm

commit 3c8a4b8fbdb42b2fa98ddec8b6d7ed3202201eb1
Merge: cec647ff3 916378103
Author: Nick Mathewson 
Date:   Tue Mar 17 15:22:02 2020 -0400

Merge branch 'trove_2020_002_041' into maint-0.4.1

 changes/ticket33119|  8 +
 src/feature/dirparse/parsecommon.c |  9 -
 src/lib/crypt_ops/crypto_rsa.c | 27 +++
 src/lib/crypt_ops/crypto_rsa.h |  5 ++-
 src/lib/crypt_ops/crypto_rsa_nss.c | 14 +++-
 src/lib/crypt_ops/crypto_rsa_openssl.c | 63 --
 src/test/test_crypto.c | 39 +
 7 files changed, 154 insertions(+), 11 deletions(-)



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

[tor-commits] [tor/release-0.4.3] Merge branch 'trove_2020_002_035' into trove_2020_002_041

2020-03-18 Thread nickm

commit dd6e2277e0d336f3d519f88d792b832d04e2c323
Merge: 1a375c3b1 29c9675bd
Author: Nick Mathewson 
Date:   Sat Mar 14 14:20:51 2020 -0400

Merge branch 'trove_2020_002_035' into trove_2020_002_041

 src/lib/crypt_ops/crypto_rsa_openssl.c |  5 +
 src/test/test_crypto.c | 24 
 2 files changed, 29 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.3] Merge branch 'maint-0.3.5' into maint-0.4.1

2020-03-18 Thread nickm

commit 57b1d0848e9b42670d6f33e37a2095740726e2b1
Merge: 3c8a4b8fb fe3d8ec38
Author: Nick Mathewson 
Date:   Tue Mar 17 15:22:36 2020 -0400

Merge branch 'maint-0.3.5' into maint-0.4.1




___
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.3] Merge branch 'maint-0.4.2' into maint-0.4.3

2020-03-18 Thread nickm

commit 84f57b69f31bf47cbc902d853040cb099256ec6d
Merge: e0d68ce84 758deaa47
Author: Nick Mathewson 
Date:   Wed Mar 18 08:20:16 2020 -0400

Merge branch 'maint-0.4.2' into maint-0.4.3

 src/lib/crypt_ops/crypto_rsa_openssl.c | 7 +++
 1 file changed, 7 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.3] fold in changelog and blurb for trove-2020-002

2020-03-18 Thread nickm

commit 2d47cb984d0f882e9347f8e7ebcac5723c94337e
Author: Nick Mathewson 
Date:   Tue Mar 17 15:37:34 2020 -0400

fold in changelog and blurb for trove-2020-002
---
 ChangeLog   | 40 
 changes/ticket33119 |  8 
 2 files changed, 32 insertions(+), 16 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9c8fecfef..98c3d01ff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,11 +1,35 @@
 Changes in version 0.4.3.3-alpha - 2020-03-??
-  blurb here.
+  Tor 0.4.3.3-alpha fixes several bugs in previous releases, including
+  TROVE-2020-002, a major denial-of-service vulnerability that affected
+  all released Tor instances since 0.2.1.5-alpha. Using this
+  vulnerability, an attacker could cause Tor instances to consume a huge
+  amount of CPU, disrupting their operations for several seconds or
+  minutes. This attack could be launched by anybody against a relay, or
+  by a directory cache against any client that had connected to it. The
+  attacker could launch this attack as much as they wanted, thereby
+  disrupting service or creating patterns that could aid in traffic
+  analysis. This issue was found by OSS-Fuzz, and is also tracked
+  as CVE-2020-10592.
+
+  We do not have reason to believe that this attack is currently being
+  exploited in the wild, but nonetheless we advise everyone to upgrade
+  as soon as packages are available.
+
+  o Major bugfixes (security, denial-of-service):
+- Fix a denial-of-service bug that could be used by anyone to
+  consume a bunch of CPU on any Tor relay or authority, or by
+  directories to consume a bunch of CPU on clients or hidden
+  services. Because of the potential for CPU consumption to
+  introduce observable timing patterns, we are treating this as a
+  high-severity security issue. Fixes bug 33119; bugfix on
+  0.2.1.5-alpha. Found by OSS-Fuzz. We are also tracking this issue
+  as TROVE-2020-002 and CVE-2020-10592.
 
   o Major bugfixes (circuit padding, memory leak):
 - Avoid a remotely triggered memory leak in the case that a circuit
   padding machine is somehow negotiated twice on the same circuit.
   Fixes bug 33619; bugfix on 0.4.0.1-alpha. Found by Tobias Pulls.
-  This is also tracked as TROVE-2020-004.
+  This is also tracked as TROVE-2020-004 and CVE-2020-10593.
 
   o Major bugfixes (directory authority):
 - Directory authorities will now send a 503 (not enough bandwidth)
@@ -44,18 +68,18 @@ Changes in version 0.4.3.3-alpha - 2020-03-??
 - Remove the buggy and unused mirroring job. Fixes bug 33213; bugfix
   on 0.3.2.2-alpha.
 
-  o Minor bugfixes (onion services v3):
-- Fix an assertion failure that could result from a corrupted
-  ADD_ONION control port command. Found by Saibato. Fixes bug 33137;
-  bugfix on 0.3.3.1-alpha. This issue is also tracked
-  as TROVE-2020-003.
-
   o Minor bugfixes (onion service v3, client):
 - Remove a BUG() warning that would cause a stack trace if an onion
   service descriptor was freed while we were waiting for a
   rendezvous circuit to complete. Fixes bug 28992; bugfix
   on 0.3.2.1-alpha.
 
+  o Minor bugfixes (onion services v3):
+- Fix an assertion failure that could result from a corrupted
+  ADD_ONION control port command. Found by Saibato. Fixes bug 33137;
+  bugfix on 0.3.3.1-alpha. This issue is also tracked
+  as TROVE-2020-003.
+
   o Documentation (manpage):
 - Alphabetize the Server and Directory server sections of the tor
   manpage. Also split Statistics options into their own section of
diff --git a/changes/ticket33119 b/changes/ticket33119
deleted file mode 100644
index 11c20bc7a..0
--- a/changes/ticket33119
+++ /dev/null
@@ -1,8 +0,0 @@
-  o Major bugfixes (security, denial-of-service):
-- Fix a denial-of-service bug that could be used by anyone to consume a
-  bunch of CPU on any Tor relay or authority, or by directories to
-  consume a bunch of CPU on clients or hidden services. Because
-  of the potential for CPU consumption to introduce observable
-  timing patterns, we are treating this as a high-severity security
-  issue.  Fixes bug 33119; bugfix on 0.2.1.5-alpha. We are also tracking
-  this issue as TROVE-2020-002.



___
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.3] Port rsa_private_key_too_long() to work on OpenSSL 1.1.0.

2020-03-18 Thread nickm

commit 0526801ed4caba4393942e62def2cb35f0f298b3
Author: Nick Mathewson 
Date:   Wed Mar 18 08:19:48 2020 -0400

Port rsa_private_key_too_long() to work on OpenSSL 1.1.0.
---
 src/lib/crypt_ops/crypto_rsa_openssl.c | 7 +++
 1 file changed, 7 insertions(+)

diff --git a/src/lib/crypt_ops/crypto_rsa_openssl.c 
b/src/lib/crypt_ops/crypto_rsa_openssl.c
index 6f3ac6fde..17eae24cc 100644
--- a/src/lib/crypt_ops/crypto_rsa_openssl.c
+++ b/src/lib/crypt_ops/crypto_rsa_openssl.c
@@ -573,6 +573,8 @@ rsa_private_key_too_long(RSA *rsa, int max_bits)
 {
   const BIGNUM *n, *e, *p, *q, *d, *dmp1, *dmq1, *iqmp;
 #ifdef OPENSSL_1_1_API
+
+#if OPENSSL_VERSION_NUMBER >= OPENSSL_V_SERIES(1,1,1)
   n = RSA_get0_n(rsa);
   e = RSA_get0_e(rsa);
   p = RSA_get0_p(rsa);
@@ -581,6 +583,11 @@ rsa_private_key_too_long(RSA *rsa, int max_bits)
   dmp1 = RSA_get0_dmp1(rsa);
   dmq1 = RSA_get0_dmq1(rsa);
   iqmp = RSA_get0_iqmp(rsa);
+#else
+  /* The accessors above did not exist in openssl 1.1.0. */
+  p = q = dmp1 = dmq1 = iqmp = NULL;
+  RSA_get0_key(rsa, , , );
+#endif
 
   if (RSA_bits(rsa) > max_bits)
 return true;



___
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.3] Add off-by-one checks for key length.

2020-03-18 Thread nickm

commit 2328c79a5fbc2f1995390dd08002244bc952246d
Author: Nick Mathewson 
Date:   Tue Mar 17 10:07:54 2020 -0400

Add off-by-one checks for key length.
---
 src/test/test_crypto.c | 15 +++
 1 file changed, 15 insertions(+)

diff --git a/src/test/test_crypto.c b/src/test/test_crypto.c
index 2373e5bf8..5af0cce13 100644
--- a/src/test/test_crypto.c
+++ b/src/test/test_crypto.c
@@ -1505,6 +1505,21 @@ test_crypto_pk_bad_size(void *arg)
   pk2 = crypto_pk_asn1_decode_private(buf, n, 1020);
   tt_assert(! pk2);
 
+  /* Set the max bit count one bit smaller: we should refuse to decode the
+ key.*/
+  pk2 = crypto_pk_asn1_decode_private(buf, n, 1023);
+  tt_assert(! pk2);
+
+  /* Correct size: should work. */
+  pk2 = crypto_pk_asn1_decode_private(buf, n, 1024);
+  tt_assert(pk2);
+  crypto_pk_free(pk2);
+
+  /* One bit larger: should work. */
+  pk2 = crypto_pk_asn1_decode_private(buf, n, 1025);
+  tt_assert(pk2);
+  crypto_pk_free(pk2);
+
   /* Set the max bit count larger: it should decode fine. */
   pk2 = crypto_pk_asn1_decode_private(buf, n, 2048);
   tt_assert(pk2);



___
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.3] Merge branch 'maint-0.4.1' into maint-0.4.2

2020-03-18 Thread nickm

commit 85141a3a74efb0db29ff98667e83b06208d1c926
Merge: 4ee269941 57b1d0848
Author: Nick Mathewson 
Date:   Tue Mar 17 15:22:36 2020 -0400

Merge branch 'maint-0.4.1' into maint-0.4.2

 changes/ticket33119|  8 +
 src/feature/dirparse/parsecommon.c |  9 -
 src/lib/crypt_ops/crypto_rsa.c | 27 +++
 src/lib/crypt_ops/crypto_rsa.h |  5 ++-
 src/lib/crypt_ops/crypto_rsa_nss.c | 14 +++-
 src/lib/crypt_ops/crypto_rsa_openssl.c | 63 --
 src/test/test_crypto.c | 39 +
 7 files changed, 154 insertions(+), 11 deletions(-)




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

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

2020-03-18 Thread nickm

commit e0d68ce84fe4536142d7f5e8987a08d9e93ac626
Merge: 6803373aa 85141a3a7
Author: Nick Mathewson 
Date:   Tue Mar 17 15:22:36 2020 -0400

Merge branch 'maint-0.4.2' into maint-0.4.3

 changes/ticket33119|  8 +
 src/feature/dirparse/parsecommon.c |  9 -
 src/lib/crypt_ops/crypto_rsa.c | 27 +++
 src/lib/crypt_ops/crypto_rsa.h |  5 ++-
 src/lib/crypt_ops/crypto_rsa_nss.c | 14 +++-
 src/lib/crypt_ops/crypto_rsa_openssl.c | 63 --
 src/test/test_crypto.c | 39 +
 7 files changed, 154 insertions(+), 11 deletions(-)




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

[tor-commits] [tor/release-0.4.3] Merge branch 'trove_2020_002_035' into trove_2020_002_041

2020-03-18 Thread nickm

commit 9163781039b96e859fc102f003a274e9716cc02d
Merge: dd6e2277e f958b537a
Author: Nick Mathewson 
Date:   Tue Mar 17 10:45:03 2020 -0400

Merge branch 'trove_2020_002_035' into trove_2020_002_041

 src/lib/crypt_ops/crypto_rsa_nss.c |  2 +-
 src/lib/crypt_ops/crypto_rsa_openssl.c | 57 +++---
 src/test/test_crypto.c | 15 +
 3 files changed, 68 insertions(+), 6 deletions(-)




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

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

2020-03-18 Thread nickm

commit 3bd0601aec61464659e16507a9c1538d0abe7822
Merge: f54681cba e0d68ce84
Author: Nick Mathewson 
Date:   Tue Mar 17 15:22:36 2020 -0400

Merge branch 'maint-0.4.3' into release-0.4.3

 changes/ticket33119|  8 +
 src/feature/dirparse/parsecommon.c |  9 -
 src/lib/crypt_ops/crypto_rsa.c | 27 +++
 src/lib/crypt_ops/crypto_rsa.h |  5 ++-
 src/lib/crypt_ops/crypto_rsa_nss.c | 14 +++-
 src/lib/crypt_ops/crypto_rsa_openssl.c | 63 --
 src/test/test_crypto.c | 39 +
 7 files changed, 154 insertions(+), 11 deletions(-)



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

[tor-commits] [tor/release-0.4.3] Pick release date, copy changelog to releasenotes.

2020-03-18 Thread nickm

commit 27cc9093af1c7f7862fb242d4de9bd27a046831c
Author: Nick Mathewson 
Date:   Wed Mar 18 09:06:28 2020 -0400

Pick release date, copy changelog to releasenotes.
---
 ChangeLog|   2 +-
 ReleaseNotes | 102 +++
 2 files changed, 103 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 98c3d01ff..0759d065f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-Changes in version 0.4.3.3-alpha - 2020-03-??
+Changes in version 0.4.3.3-alpha - 2020-03-18
   Tor 0.4.3.3-alpha fixes several bugs in previous releases, including
   TROVE-2020-002, a major denial-of-service vulnerability that affected
   all released Tor instances since 0.2.1.5-alpha. Using this
diff --git a/ReleaseNotes b/ReleaseNotes
index 7d981e2c4..73f0be95a 100644
--- a/ReleaseNotes
+++ b/ReleaseNotes
@@ -2,6 +2,108 @@ This document summarizes new features and bugfixes in each 
stable
 release of Tor. If you want to see more detailed descriptions of the
 changes in each development snapshot, see the ChangeLog file.
 
+Changes in version 0.4.3.3-alpha - 2020-03-18
+  Tor 0.4.3.3-alpha fixes several bugs in previous releases, including
+  TROVE-2020-002, a major denial-of-service vulnerability that affected
+  all released Tor instances since 0.2.1.5-alpha. Using this
+  vulnerability, an attacker could cause Tor instances to consume a huge
+  amount of CPU, disrupting their operations for several seconds or
+  minutes. This attack could be launched by anybody against a relay, or
+  by a directory cache against any client that had connected to it. The
+  attacker could launch this attack as much as they wanted, thereby
+  disrupting service or creating patterns that could aid in traffic
+  analysis. This issue was found by OSS-Fuzz, and is also tracked
+  as CVE-2020-10592.
+
+  We do not have reason to believe that this attack is currently being
+  exploited in the wild, but nonetheless we advise everyone to upgrade
+  as soon as packages are available.
+
+  o Major bugfixes (security, denial-of-service):
+- Fix a denial-of-service bug that could be used by anyone to
+  consume a bunch of CPU on any Tor relay or authority, or by
+  directories to consume a bunch of CPU on clients or hidden
+  services. Because of the potential for CPU consumption to
+  introduce observable timing patterns, we are treating this as a
+  high-severity security issue. Fixes bug 33119; bugfix on
+  0.2.1.5-alpha. Found by OSS-Fuzz. We are also tracking this issue
+  as TROVE-2020-002 and CVE-2020-10592.
+
+  o Major bugfixes (circuit padding, memory leak):
+- Avoid a remotely triggered memory leak in the case that a circuit
+  padding machine is somehow negotiated twice on the same circuit.
+  Fixes bug 33619; bugfix on 0.4.0.1-alpha. Found by Tobias Pulls.
+  This is also tracked as TROVE-2020-004 and CVE-2020-10593.
+
+  o Major bugfixes (directory authority):
+- Directory authorities will now send a 503 (not enough bandwidth)
+  code to clients when under bandwidth pressure. Known relays and
+  other authorities will always be answered regardless of the
+  bandwidth situation. Fixes bug 33029; bugfix on 0.1.2.5-alpha.
+
+  o Minor features (diagnostic):
+- Improve assertions and add some memory-poisoning code to try to
+  track down possible causes of a rare crash (32564) in the EWMA
+  code. Closes ticket 33290.
+
+  o Minor features (directory authorities):
+- Directory authorities now reject descriptors from relays running
+  Tor versions from the 0.2.9 and 0.4.0 series. The 0.3.5 series is
+  still allowed. Resolves ticket 32672. Patch by Neel Chauhan.
+
+  o Minor features (usability):
+- Include more information when failing to parse a configuration
+  value. This should make it easier to tell what's going wrong when
+  a configuration file doesn't parse. Closes ticket 33460.
+
+  o Minor bugfix (relay, configuration):
+- Warn if the ContactInfo field is not set, and tell the relay
+  operator that not having a ContactInfo field set might cause their
+  relay to get rejected in the future. Fixes bug 33361; bugfix
+  on 0.1.1.10-alpha.
+
+  o Minor bugfixes (coding best practices checks):
+- Allow the "practracker" script to read unicode files when using
+  Python 2. We made the script use unicode literals in 0.4.3.1-alpha,
+  but didn't change the codec for opening files. Fixes bug 33374;
+  bugfix on 0.4.3.1-alpha.
+
+  o Minor bugfixes (continuous integration):
+- Remove the buggy and unused mirroring job. Fixes bug 33213; bugfix
+  on 0.3.2.2-alpha.
+
+  o Minor bugfixes (onion service v3, client):
+- Remove a BUG() warning that would cause a stack trace if an onion
+  service descriptor was freed while we were waiting for a
+  rendezvous circuit to complete. Fixes bug 28992; bugfix
+  on 0.3.2.1-alpha.
+
+  o Minor

[tor-commits] [tor/release-0.4.3] Merge branch 'maint-0.4.1' into maint-0.4.2

2020-03-18 Thread nickm

commit 758deaa472b879645828c1ee585eb6ce8b8a9a50
Merge: 85141a3a7 4ad3f17c2
Author: Nick Mathewson 
Date:   Wed Mar 18 08:20:16 2020 -0400

Merge branch 'maint-0.4.1' into maint-0.4.2

 src/lib/crypt_ops/crypto_rsa_openssl.c | 7 +++
 1 file changed, 7 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.3] Use >= consistently with max_bits.

2020-03-18 Thread nickm

commit f958b537abc1285dd627c03f091dc94a5d17995a
Author: Nick Mathewson 
Date:   Tue Mar 17 10:09:58 2020 -0400

Use >= consistently with max_bits.
---
 src/lib/crypt_ops/crypto_rsa_nss.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/crypt_ops/crypto_rsa_nss.c 
b/src/lib/crypt_ops/crypto_rsa_nss.c
index 4cf699067..7abf6716f 100644
--- a/src/lib/crypt_ops/crypto_rsa_nss.c
+++ b/src/lib/crypt_ops/crypto_rsa_nss.c
@@ -736,7 +736,7 @@ crypto_pk_asn1_decode_private(const char *str, size_t len, 
int max_bits)
 
   if (output) {
 const int bits = SECKEY_PublicKeyStrengthInBits(output->pubkey);
-if (max_bits > 0 && bits > max_bits) {
+if (max_bits >= 0 && bits > max_bits) {
   log_info(LD_CRYPTO, "Private key longer than expected.");
   crypto_pk_free(output);
   output = NULL;



___
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.3] Merge branch 'maint-0.3.5' into maint-0.4.1

2020-03-18 Thread nickm

commit 4ad3f17c26166b898cd768a6e1835fad2ef67005
Merge: 57b1d0848 0526801ed
Author: Nick Mathewson 
Date:   Wed Mar 18 08:20:16 2020 -0400

Merge branch 'maint-0.3.5' into maint-0.4.1

 src/lib/crypt_ops/crypto_rsa_openssl.c | 7 +++
 1 file changed, 7 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.3] Fix memory leak in crypto_pk_asn1_decode_private.

2020-03-18 Thread nickm

commit 29c9675bdeb5a63564e9a76dcd7162bef884b240
Author: Nick Mathewson 
Date:   Sat Mar 14 14:17:33 2020 -0400

Fix memory leak in crypto_pk_asn1_decode_private.

(Deep, deep thanks to Taylor for reminding me to test this!)
---
 src/lib/crypt_ops/crypto_rsa_openssl.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/lib/crypt_ops/crypto_rsa_openssl.c 
b/src/lib/crypt_ops/crypto_rsa_openssl.c
index 39b7aaf0c..0db25f347 100644
--- a/src/lib/crypt_ops/crypto_rsa_openssl.c
+++ b/src/lib/crypt_ops/crypto_rsa_openssl.c
@@ -590,6 +590,7 @@ crypto_pk_asn1_decode_private(const char *str, size_t len, 
int max_bits)
   if (max_bits >= 0 && rsa->n && BN_num_bits(rsa->n) > max_bits) {
 #endif
 log_info(LD_CRYPTO, "Private key longer than expected.");
+RSA_free(rsa);
 return NULL;
   }
   crypto_pk_t *result = crypto_new_pk_from_openssl_rsa_(rsa);



___
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.2] Add a test for crypto_pk_asn1_decode_private maxbits.

2020-03-18 Thread nickm

commit ab2e66ccdc4406a195d77b202bae21c17c634cb5
Author: Nick Mathewson 
Date:   Sat Mar 14 13:50:38 2020 -0400

Add a test for crypto_pk_asn1_decode_private maxbits.
---
 src/test/test_crypto.c | 24 
 1 file changed, 24 insertions(+)

diff --git a/src/test/test_crypto.c b/src/test/test_crypto.c
index fa79f4cc4..2373e5bf8 100644
--- a/src/test/test_crypto.c
+++ b/src/test/test_crypto.c
@@ -1492,6 +1492,29 @@ test_crypto_pk_pem_encrypted(void *arg)
 }
 
 static void
+test_crypto_pk_bad_size(void *arg)
+{
+  (void)arg;
+  crypto_pk_t *pk1 = pk_generate(0);
+  crypto_pk_t *pk2 = NULL;
+  char buf[2048];
+  int n = crypto_pk_asn1_encode_private(pk1, buf, sizeof(buf));
+  tt_int_op(n, OP_GT, 0);
+
+  /* Set the max bit count smaller: we should refuse to decode the key.*/
+  pk2 = crypto_pk_asn1_decode_private(buf, n, 1020);
+  tt_assert(! pk2);
+
+  /* Set the max bit count larger: it should decode fine. */
+  pk2 = crypto_pk_asn1_decode_private(buf, n, 2048);
+  tt_assert(pk2);
+
+ done:
+  crypto_pk_free(pk1);
+  crypto_pk_free(pk2);
+}
+
+static void
 test_crypto_pk_invalid_private_key(void *arg)
 {
   (void)arg;
@@ -3163,6 +3186,7 @@ struct testcase_t crypto_tests[] = {
   { "pk_fingerprints", test_crypto_pk_fingerprints, TT_FORK, NULL, NULL },
   { "pk_base64", test_crypto_pk_base64, TT_FORK, NULL, NULL },
   { "pk_pem_encrypted", test_crypto_pk_pem_encrypted, TT_FORK, NULL, NULL },
+  { "pk_bad_size", test_crypto_pk_bad_size, 0, NULL, NULL },
   { "pk_invalid_private_key", test_crypto_pk_invalid_private_key, 0,
 NULL, NULL },
   CRYPTO_LEGACY(digests),



___
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.2] Merge branch 'maint-0.4.1' into maint-0.4.2

2020-03-18 Thread nickm

commit 85141a3a74efb0db29ff98667e83b06208d1c926
Merge: 4ee269941 57b1d0848
Author: Nick Mathewson 
Date:   Tue Mar 17 15:22:36 2020 -0400

Merge branch 'maint-0.4.1' into maint-0.4.2

 changes/ticket33119|  8 +
 src/feature/dirparse/parsecommon.c |  9 -
 src/lib/crypt_ops/crypto_rsa.c | 27 +++
 src/lib/crypt_ops/crypto_rsa.h |  5 ++-
 src/lib/crypt_ops/crypto_rsa_nss.c | 14 +++-
 src/lib/crypt_ops/crypto_rsa_openssl.c | 63 --
 src/test/test_crypto.c | 39 +
 7 files changed, 154 insertions(+), 11 deletions(-)




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

[tor-commits] [tor/release-0.4.2] Pick release date, copy changelog to releasenotes.

2020-03-18 Thread nickm

commit 74cad14699087b7ee0b6b17927a3f64683fe31e9
Author: Nick Mathewson 
Date:   Wed Mar 18 09:06:21 2020 -0400

Pick release date, copy changelog to releasenotes.
---
 ChangeLog|  2 +-
 ReleaseNotes | 78 
 2 files changed, 79 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 89bd916da..6cb4c8cfd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-Changes in version 0.4.2.7 - 2020-03-??
+Changes in version 0.4.2.7 - 2020-03-18
   This is the third stable release in the 0.4.2.x series. It backports
   numerous fixes from later releases, including a fix for TROVE-2020-
   002, a major denial-of-service vulnerability that affected all
diff --git a/ReleaseNotes b/ReleaseNotes
index b7c0dbcef..c85dca55d 100644
--- a/ReleaseNotes
+++ b/ReleaseNotes
@@ -2,6 +2,84 @@ This document summarizes new features and bugfixes in each 
stable
 release of Tor. If you want to see more detailed descriptions of the
 changes in each development snapshot, see the ChangeLog file.
 
+Changes in version 0.4.2.7 - 2020-03-18
+  This is the third stable release in the 0.4.2.x series. It backports
+  numerous fixes from later releases, including a fix for TROVE-2020-
+  002, a major denial-of-service vulnerability that affected all
+  released Tor instances since 0.2.1.5-alpha. Using this vulnerability,
+  an attacker could cause Tor instances to consume a huge amount of CPU,
+  disrupting their operations for several seconds or minutes. This
+  attack could be launched by anybody against a relay, or by a directory
+  cache against any client that had connected to it. The attacker could
+  launch this attack as much as they wanted, thereby disrupting service
+  or creating patterns that could aid in traffic analysis. This issue
+  was found by OSS-Fuzz, and is also tracked as CVE-2020-10592.
+
+  We do not have reason to believe that this attack is currently being
+  exploited in the wild, but nonetheless we advise everyone to upgrade
+  as soon as packages are available.
+
+  o Major bugfixes (security, denial-of-service, backport from 0.4.3.3-alpha):
+- Fix a denial-of-service bug that could be used by anyone to
+  consume a bunch of CPU on any Tor relay or authority, or by
+  directories to consume a bunch of CPU on clients or hidden
+  services. Because of the potential for CPU consumption to
+  introduce observable timing patterns, we are treating this as a
+  high-severity security issue. Fixes bug 33119; bugfix on
+  0.2.1.5-alpha. Found by OSS-Fuzz. We are also tracking this issue
+  as TROVE-2020-002 and CVE-2020-10592.
+
+  o Major bugfixes (circuit padding, memory leak, backport from 0.4.3.3-alpha):
+- Avoid a remotely triggered memory leak in the case that a circuit
+  padding machine is somehow negotiated twice on the same circuit.
+  Fixes bug 33619; bugfix on 0.4.0.1-alpha. Found by Tobias Pulls.
+  This is also tracked as TROVE-2020-004 and CVE-2020-10593.
+
+  o Major bugfixes (directory authority, backport from 0.4.3.3-alpha):
+- Directory authorities will now send a 503 (not enough bandwidth)
+  code to clients when under bandwidth pressure. Known relays and
+  other authorities will always be answered regardless of the
+  bandwidth situation. Fixes bug 33029; bugfix on 0.1.2.5-alpha.
+
+  o Minor features (continuous integration, backport from 0.4.3.2-alpha):
+- Stop allowing failures on the Travis CI stem tests job. It looks
+  like all the stem hangs we were seeing before are now fixed.
+  Closes ticket 33075.
+
+  o Minor bugfixes (bridges, backport from 0.4.3.1-alpha):
+- Lowercase the configured value of BridgeDistribution before adding
+  it to the descriptor. Fixes bug 32753; bugfix on 0.3.2.3-alpha.
+
+  o Minor bugfixes (logging, backport from 0.4.3.2-alpha):
+- If we encounter a bug when flushing a buffer to a TLS connection,
+  only log the bug once per invocation of the Tor process.
+  Previously we would log with every occurrence, which could cause
+  us to run out of disk space. Fixes bug 33093; bugfix
+  on 0.3.2.2-alpha.
+
+  o Minor bugfixes (onion services v3, backport from 0.4.3.3-alpha):
+- Fix an assertion failure that could result from a corrupted
+  ADD_ONION control port command. Found by Saibato. Fixes bug 33137;
+  bugfix on 0.3.3.1-alpha. This issue is also tracked
+  as TROVE-2020-003.
+
+  o Minor bugfixes (rust, build, backport from 0.4.3.2-alpha):
+- Fix a syntax warning given by newer versions of Rust that was
+  creating problems for our continuous integration. Fixes bug 33212;
+  bugfix on 0.3.5.1-alpha.
+
+  o Testing (Travis CI, backport from 0.4.3.3-alpha):
+- Remove a redundant distcheck job. Closes ticket 33194.
+- Sort the Travis jobs in order of speed: putting the slowest jobs
+  first takes full advantage of Travis job concurrency. Closes
+

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

2020-03-18 Thread nickm

commit a74f620e5281194566bf30a656ddd2f6952656c9
Merge: 40536768b 85141a3a7
Author: Nick Mathewson 
Date:   Tue Mar 17 15:22:36 2020 -0400

Merge branch 'maint-0.4.2' into release-0.4.2

 changes/ticket33119|  8 +
 src/feature/dirparse/parsecommon.c |  9 -
 src/lib/crypt_ops/crypto_rsa.c | 27 +++
 src/lib/crypt_ops/crypto_rsa.h |  5 ++-
 src/lib/crypt_ops/crypto_rsa_nss.c | 14 +++-
 src/lib/crypt_ops/crypto_rsa_openssl.c | 63 --
 src/test/test_crypto.c | 39 +
 7 files changed, 154 insertions(+), 11 deletions(-)



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

[tor-commits] [tor/release-0.4.2] Merge branch 'trove_2020_002_035' into maint-0.3.5

2020-03-18 Thread nickm

commit fe3d8ec38e3c4c2a992280c2847cdd8e05f81d36
Merge: 089e57d22 f958b537a
Author: Nick Mathewson 
Date:   Tue Mar 17 15:21:48 2020 -0400

Merge branch 'trove_2020_002_035' into maint-0.3.5

 changes/ticket33119|  8 +
 src/feature/dirparse/parsecommon.c |  9 -
 src/lib/crypt_ops/crypto_rsa.c | 27 +++
 src/lib/crypt_ops/crypto_rsa.h |  5 ++-
 src/lib/crypt_ops/crypto_rsa_nss.c | 14 +++-
 src/lib/crypt_ops/crypto_rsa_openssl.c | 63 --
 src/test/test_crypto.c | 39 +
 7 files changed, 154 insertions(+), 11 deletions(-)



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

[tor-commits] [tor/release-0.4.3] changes file for 33119 aka TROVE-2020-002

2020-03-18 Thread nickm

commit d0bce65ce2426793a975e691204c3fb2ac667f66
Author: Nick Mathewson 
Date:   Wed Feb 5 12:02:32 2020 -0500

changes file for 33119 aka TROVE-2020-002
---
 changes/ticket33119 | 8 
 1 file changed, 8 insertions(+)

diff --git a/changes/ticket33119 b/changes/ticket33119
new file mode 100644
index 0..11c20bc7a
--- /dev/null
+++ b/changes/ticket33119
@@ -0,0 +1,8 @@
+  o Major bugfixes (security, denial-of-service):
+- Fix a denial-of-service bug that could be used by anyone to consume a
+  bunch of CPU on any Tor relay or authority, or by directories to
+  consume a bunch of CPU on clients or hidden services. Because
+  of the potential for CPU consumption to introduce observable
+  timing patterns, we are treating this as a high-severity security
+  issue.  Fixes bug 33119; bugfix on 0.2.1.5-alpha. We are also tracking
+  this issue as TROVE-2020-002.



___
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.2] Extract key length check into a new function, and check more fields.

2020-03-18 Thread nickm

commit 8abdb394893a1704f885278f5f5d7913cdf516c9
Author: Nick Mathewson 
Date:   Tue Mar 17 10:04:38 2020 -0400

Extract key length check into a new function, and check more fields.

In the openssl that I have, it should be safe to only check the size
of n.  But if I'm wrong, or if other openssls work differently, we
should check whether any of the fields are too large.

Issue spotted by Teor.
---
 src/lib/crypt_ops/crypto_rsa_openssl.c | 57 +++---
 1 file changed, 52 insertions(+), 5 deletions(-)

diff --git a/src/lib/crypt_ops/crypto_rsa_openssl.c 
b/src/lib/crypt_ops/crypto_rsa_openssl.c
index 0db25f347..6f3ac6fde 100644
--- a/src/lib/crypt_ops/crypto_rsa_openssl.c
+++ b/src/lib/crypt_ops/crypto_rsa_openssl.c
@@ -33,6 +33,7 @@ ENABLE_GCC_WARNING(redundant-decls)
 #include "lib/encoding/binascii.h"
 
 #include 
+#include 
 
 /** Declaration for crypto_pk_t structure. */
 struct crypto_pk_t
@@ -564,6 +565,56 @@ crypto_pk_asn1_encode_private(const crypto_pk_t *pk, char 
*dest,
   return len;
 }
 
+/** Check whether any component of a private key is too large in a way that
+ * seems likely to make verification too expensive. Return true if it's too
+ * long, and false otherwise. */
+static bool
+rsa_private_key_too_long(RSA *rsa, int max_bits)
+{
+  const BIGNUM *n, *e, *p, *q, *d, *dmp1, *dmq1, *iqmp;
+#ifdef OPENSSL_1_1_API
+  n = RSA_get0_n(rsa);
+  e = RSA_get0_e(rsa);
+  p = RSA_get0_p(rsa);
+  q = RSA_get0_q(rsa);
+  d = RSA_get0_d(rsa);
+  dmp1 = RSA_get0_dmp1(rsa);
+  dmq1 = RSA_get0_dmq1(rsa);
+  iqmp = RSA_get0_iqmp(rsa);
+
+  if (RSA_bits(rsa) > max_bits)
+return true;
+#else
+  n = rsa->n;
+  e = rsa->e;
+  p = rsa->p;
+  q = rsa->q;
+  d = rsa->d;
+  dmp1 = rsa->dmp1;
+  dmq1 = rsa->dmq1;
+  iqmp = rsa->iqmp;
+#endif
+
+  if (n && BN_num_bits(n) > max_bits)
+return true;
+  if (e && BN_num_bits(e) > max_bits)
+return true;
+  if (p && BN_num_bits(p) > max_bits)
+return true;
+  if (q && BN_num_bits(q) > max_bits)
+return true;
+  if (d && BN_num_bits(d) > max_bits)
+return true;
+  if (dmp1 && BN_num_bits(dmp1) > max_bits)
+return true;
+  if (dmq1 && BN_num_bits(dmq1) > max_bits)
+return true;
+  if (iqmp && BN_num_bits(iqmp) > max_bits)
+return true;
+
+  return false;
+}
+
 /** Decode an ASN.1-encoded private key from str; return the result on
  * success and NULL on failure.
  *
@@ -584,11 +635,7 @@ crypto_pk_asn1_decode_private(const char *str, size_t len, 
int max_bits)
 crypto_openssl_log_errors(LOG_WARN,"decoding private key");
 return NULL;
   }
-#ifdef OPENSSL_1_1_API
-  if (max_bits >= 0 && RSA_bits(rsa) > max_bits) {
-#else
-  if (max_bits >= 0 && rsa->n && BN_num_bits(rsa->n) > max_bits) {
-#endif
+  if (max_bits >= 0 && rsa_private_key_too_long(rsa, max_bits)) {
 log_info(LD_CRYPTO, "Private key longer than expected.");
 RSA_free(rsa);
 return NULL;



___
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.3] Add a test for crypto_pk_asn1_decode_private maxbits.

2020-03-18 Thread nickm

commit ab2e66ccdc4406a195d77b202bae21c17c634cb5
Author: Nick Mathewson 
Date:   Sat Mar 14 13:50:38 2020 -0400

Add a test for crypto_pk_asn1_decode_private maxbits.
---
 src/test/test_crypto.c | 24 
 1 file changed, 24 insertions(+)

diff --git a/src/test/test_crypto.c b/src/test/test_crypto.c
index fa79f4cc4..2373e5bf8 100644
--- a/src/test/test_crypto.c
+++ b/src/test/test_crypto.c
@@ -1492,6 +1492,29 @@ test_crypto_pk_pem_encrypted(void *arg)
 }
 
 static void
+test_crypto_pk_bad_size(void *arg)
+{
+  (void)arg;
+  crypto_pk_t *pk1 = pk_generate(0);
+  crypto_pk_t *pk2 = NULL;
+  char buf[2048];
+  int n = crypto_pk_asn1_encode_private(pk1, buf, sizeof(buf));
+  tt_int_op(n, OP_GT, 0);
+
+  /* Set the max bit count smaller: we should refuse to decode the key.*/
+  pk2 = crypto_pk_asn1_decode_private(buf, n, 1020);
+  tt_assert(! pk2);
+
+  /* Set the max bit count larger: it should decode fine. */
+  pk2 = crypto_pk_asn1_decode_private(buf, n, 2048);
+  tt_assert(pk2);
+
+ done:
+  crypto_pk_free(pk1);
+  crypto_pk_free(pk2);
+}
+
+static void
 test_crypto_pk_invalid_private_key(void *arg)
 {
   (void)arg;
@@ -3163,6 +3186,7 @@ struct testcase_t crypto_tests[] = {
   { "pk_fingerprints", test_crypto_pk_fingerprints, TT_FORK, NULL, NULL },
   { "pk_base64", test_crypto_pk_base64, TT_FORK, NULL, NULL },
   { "pk_pem_encrypted", test_crypto_pk_pem_encrypted, TT_FORK, NULL, NULL },
+  { "pk_bad_size", test_crypto_pk_bad_size, 0, NULL, NULL },
   { "pk_invalid_private_key", test_crypto_pk_invalid_private_key, 0,
 NULL, NULL },
   CRYPTO_LEGACY(digests),



___
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.2] Merge branch 'maint-0.4.1' into maint-0.4.2

2020-03-18 Thread nickm

commit 758deaa472b879645828c1ee585eb6ce8b8a9a50
Merge: 85141a3a7 4ad3f17c2
Author: Nick Mathewson 
Date:   Wed Mar 18 08:20:16 2020 -0400

Merge branch 'maint-0.4.1' into maint-0.4.2

 src/lib/crypt_ops/crypto_rsa_openssl.c | 7 +++
 1 file changed, 7 insertions(+)




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

1 2 3 >

1 - 100 of 250 matches

Mail list logo