date:20191003

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

2019-10-03 Thread translation

commit eab476639242b0a3a716dc85fb0972285ac70565
Author: Translation commit bot 
Date:   Fri Oct 4 04:52:43 2019 +

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

diff --git a/contents+tr.po b/contents+tr.po
index 798a2f506..c53737697 100644
--- a/contents+tr.po
+++ b/contents+tr.po
@@ -1,8 +1,8 @@
 # Translators:
 # erinm, 2019
 # T. E. Kalayci , 2019
-# Kaya Zeren , 2019
 # Emma Peel, 2019
+# Kaya Zeren , 2019
 # 
 msgid ""
 msgstr ""
@@ -10,7 +10,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-10-02 19:24+CET\n"
 "PO-Revision-Date: 2019-03-09 10:41+\n"
-"Last-Translator: Emma Peel, 2019\n"
+"Last-Translator: Kaya Zeren , 2019\n"
 "Language-Team: Turkish (https://www.transifex.com/otf/teams/1519/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -75,9 +75,10 @@ msgid ""
 "answers to frequently asked questions about connecting to Tor, circumventing"
 " censorship, using onion services, and more."
 msgstr ""
-"YardÄ±ma gerek duyuyorsanÄ±z, Tor, engellemeleri aÅmak, onion hizmetlerini "
-"kullanmak ve diÄer konularda sÄ±k sorulan sorularÄ±n yanÄ±tlarÄ±nÄ± gÃ¶rmek 
iÃ§in "
-"[Destek Sitemize](https://support.torproject.org/tr/) bakabilirsiniz."
+"YardÄ±ma gerek duyuyorsanÄ±z, Tor hakkÄ±nda bilgi almak ve engellemeleri 
aÅmak,"
+" onion hizmetlerini kullanmak gibi konularda sÄ±k sorulan sorularÄ±n "
+"yanÄ±tlarÄ±nÄ± gÃ¶rmek iÃ§in [Destek "
+"Sitemize](https://support.torproject.org/tr/) bakabilirsiniz."
 
 #: https//www.torproject.org/download/
 #: (content/download/contents+en.lrpage.title)
@@ -174,8 +175,8 @@ msgid ""
 "We need your help to keep Tor secure and safe for millions across the globe."
 " [Donate Now](https://donate.torproject.org/)"
 msgstr ""
-"Tor uygulamasÄ±nÄ± koruyup gÃ¼vende tutarak dÃ¼nya Ã§apÄ±ndaki milyonlarca 
insana "
-"sunabilmek iÃ§in desteÄiniz gerekiyor. [BaÄÄ±Å "
+"Tor uygulamasÄ±nÄ± koruyup gÃ¼vende tutarak, dÃ¼nya Ã§apÄ±ndaki milyonlarca 
insana"
+" sunmayÄ± sÃ¼rdÃ¼rebilmemiz iÃ§in desteÄiniz gerekiyor. [BaÄÄ±Å "
 "YapÄ±n](https://donate.torproject.org/tr)"
 
 #: https//www.torproject.org/about/ (content/about/contents+en.lrpage.title)
@@ -224,6 +225,10 @@ msgid ""
 "add more. Want to help us translate? [See "
 "here](https://community.torproject.org/localization/)"
 msgstr ""
+"Herkesin Tor Browser uygulamasÄ±nÄ± kendi dilinde kullanma keyfini 
yaÅamasÄ±nÄ± "
+"istiyoruz. Tor Browser bugÃ¼n 30 farklÄ± dilde sunuluyor ve daha fazlasÄ±nÄ± "
+"eklemek iÃ§in Ã§alÄ±ÅÄ±yoruz. Ãevirilere yardÄ±mcÄ± olmak isterseniz 
[buraya "
+"bakabilirsiniz](https://community.torproject.org/localization/)"
 
 #: https//www.torproject.org/download/tor/
 #: (content/download/tor/contents+en.lrpage.title)
@@ -739,6 +744,10 @@ msgid ""
 "alpha\">Tor Browser Project page and also from our distribution directory."
 msgstr ""
+"Tor Browser 8.5a10 https://www.torproject.org/projects/torbrowser.html.en#downloads-;
+"alpha\">Tor Browser Proje sayfasÄ±ndan ve a "
+"href=\"/dist/torbrowser/8.5a10/\">daÄÄ±tÄ±m dizinimizden indirilebilir."
 
 #: https//www.torproject.org/about/trademark/trademark-faq/
 #: (content/about/trademark/trademark-faq/contents+en.lrtopic.title)

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

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

2019-10-03 Thread translation

commit 7cc06f998992cbf2788e2d40e70b20057a02d48b
Author: Translation commit bot 
Date:   Fri Oct 4 04:50:56 2019 +


https://gitweb.torproject.org/translation.git/commit/?h=torbutton-branddtd_completed
---
 tr/brand.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tr/brand.dtd b/tr/brand.dtd
index ffcf53e21..1255df2fa 100644
--- a/tr/brand.dtd
+++ b/tr/brand.dtd
@@ -6,7 +6,7 @@
 
 
 
-
+
 
 
 

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

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

2019-10-03 Thread translation

commit a4c55e9f1099185a65e60dc236550a7a2628bb23
Author: Translation commit bot 
Date:   Fri Oct 4 04:50:50 2019 +

https://gitweb.torproject.org/translation.git/commit/?h=torbutton-branddtd
---
 tr/brand.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tr/brand.dtd b/tr/brand.dtd
index dd472dc4a..1255df2fa 100644
--- a/tr/brand.dtd
+++ b/tr/brand.dtd
@@ -6,7 +6,7 @@
 
 
 
-
+
 
 
 

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

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

2019-10-03 Thread translation

commit 98f70800ebfd6199d2c465cbd0e73d2ed7e072fb
Author: Translation commit bot 
Date:   Fri Oct 4 04:45:16 2019 +

https://gitweb.torproject.org/translation.git/commit/?h=bridgedb
---
 tr/LC_MESSAGES/bridgedb.po | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tr/LC_MESSAGES/bridgedb.po b/tr/LC_MESSAGES/bridgedb.po
index ba98d98bd..3b18db88c 100644
--- a/tr/LC_MESSAGES/bridgedb.po
+++ b/tr/LC_MESSAGES/bridgedb.po
@@ -27,8 +27,8 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 
'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB=bridgedb-reported,msgid=isis,sysrqb=isis'\n"
 "POT-Creation-Date: 2019-10-03 15:04-0700\n"
-"PO-Revision-Date: 2019-10-04 00:54+\n"
-"Last-Translator: erinm\n"
+"PO-Revision-Date: 2019-10-04 04:34+\n"
+"Last-Translator: Kaya Zeren \n"
 "Language-Team: Turkish 
(http://www.transifex.com/otf/torproject/language/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -300,7 +300,7 @@ msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you 
must\n"
 "send the email using an address from one of the following email providers:\n"
 "%s or %s."
-msgstr "KÃ¶prÃ¼leri almanÄ±n diÄer bir yolu da %s adresine bir e-posta 
gÃ¶ndermektir.\nLÃ¼tfen e-postanÄ±n aÅaÄÄ±daki e-posta saÄlayÄ±cÄ±lardan 
birinden alÄ±nmÄ±Å bir\nadresten gÃ¶nderilmesi gerektiÄini unutmayÄ±n:\n%s 
veya %s."
+msgstr "KÃ¶prÃ¼leri almanÄ±n diÄer bir yolu da %s adresine bir e-posta 
gÃ¶ndermektir.\nLÃ¼tfen e-postanÄ±n aÅaÄÄ±daki e-posta hizmeti 
saÄlayÄ±cÄ±larÄ±n birinden alÄ±nmÄ±Å bir\nadresten gÃ¶nderilmesi gerektiÄini 
unutmayÄ±n:\n%s ya da %s."
 
 #: bridgedb/strings.py:115
 msgid "My bridges don't work! I need help!"
@@ -310,7 +310,7 @@ msgstr "KÃ¶prÃ¼lerim Ã§alÄ±ÅmÄ±yor! YardÄ±m gerek!"
 #: bridgedb/strings.py:117
 #, python-format
 msgid "If your Tor cannot connect, please take a look at the %s and our %s."
-msgstr ""
+msgstr "Tor uygulamanÄ±z baÄlantÄ± kuramÄ±yorsa lÃ¼tfen %s ve %s 
bÃ¶lÃ¼mlerine bakÄ±n."
 
 #: bridgedb/strings.py:121
 msgid "Here are your bridge lines:"

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

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

2019-10-03 Thread translation

commit 2117466ecb8f59eabff593a5220ce5a543f421d8
Author: Translation commit bot 
Date:   Fri Oct 4 04:45:24 2019 +

https://gitweb.torproject.org/translation.git/commit/?h=bridgedb_completed
---
 tr/LC_MESSAGES/bridgedb.po | 139 +++--
 1 file changed, 72 insertions(+), 67 deletions(-)

diff --git a/tr/LC_MESSAGES/bridgedb.po b/tr/LC_MESSAGES/bridgedb.po
index 0dd1a087c..3b18db88c 100644
--- a/tr/LC_MESSAGES/bridgedb.po
+++ b/tr/LC_MESSAGES/bridgedb.po
@@ -1,6 +1,6 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
 # 
 # Translators:
 # Bullgeschichte , 2015
@@ -26,17 +26,36 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 
'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB=bridgedb-reported,msgid=isis,sysrqb=isis'\n"
-"POT-Creation-Date: 2015-07-25 03:40+\n"
-"PO-Revision-Date: 2019-04-09 02:36+\n"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: 2019-10-04 04:34+\n"
 "Last-Translator: Kaya Zeren \n"
 "Language-Team: Turkish 
(http://www.transifex.com/otf/torproject/language/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.7.0\n"
 "Language: tr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates.  (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : Localisations which BridgeDB supports which should be rendered right-to-
+#. left.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
 #. "BridgeDB"
@@ -48,35 +67,31 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
 msgid "Sorry! Something went wrong with your request."
 msgstr "ÃzgÃ¼nÃ¼z! Ä°steÄiniz ile ilgili bir Åeyler ters gitti."
 
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
 msgid "Report a Bug"
 msgstr "Bir Hata Bildirin"
 
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
 msgid "Source Code"
 msgstr "Kaynak Kodu"
 
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:85
 msgid "Changelog"
 msgstr "SÃ¼rÃ¼m NotlarÄ±"
 
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Ä°letiÅim"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
 msgid "Select All"
 msgstr "TÃ¼mÃ¼nÃ¼ SeÃ§"
 
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
 msgid "Show QRCode"
 msgstr "QR Kodunu GÃ¶rÃ¼ntÃ¼le"
 
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"
 msgstr "KÃ¶prÃ¼ satÄ±rlarÄ±nÄ±zÄ±n QR Kodu"
 
@@ -84,58 +99,58 @@ msgstr "KÃ¶prÃ¼ satÄ±rlarÄ±nÄ±zÄ±n QR Kodu"
 #. "There was a problem!" in your language. For example,
 #. for Italian, you might translate this into "Mama mia!",
 #. or for French: "Sacrebleu!". :)
-#: bridgedb/https/templates/bridges.html:67
-#: bridgedb/https/templates/bridges.html:125
+#: bridgedb/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
 msgid "Uh oh, spaghettios!"
 msgstr "Haydi hayÄ±rlÄ±sÄ±!"
 
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:68
 msgid "It seems there was an error getting your QRCode."
 msgstr "QR Kodunuzun alÄ±nmasÄ±nda bir sorun

[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/1392'

2019-10-03 Thread teor

commit e5b8bd38abae3ef03b08499f6b74227f1ccf7d32
Merge: c8df2c720 b2802ae3c
Author: teor 
Date:   Fri Oct 4 11:26:43 2019 +1000

Merge remote-tracking branch 'tor-github/pr/1392'

 src/test/test_util.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

[tor-commits] [tor/master] util/map_anon_nofork: Add a cast to avoid passing -48 to memset

2019-10-03 Thread teor

commit b2802ae3c31e4b803427bbce4f8de78558660738
Author: Nick Mathewson 
Date:   Thu Oct 3 07:21:25 2019 -0400

util/map_anon_nofork: Add a cast to avoid passing -48 to memset

This fixes coverity CID 1454593, and bug 31948. Bug not in any
released version of Tor.
---
 src/test/test_util.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/test_util.c b/src/test/test_util.c
index 5024b2340..aebefe64c 100644
--- a/src/test/test_util.c
+++ b/src/test/test_util.c
@@ -6197,7 +6197,7 @@ test_util_map_anon_nofork(void *arg)
   tor_munmap_anonymous(ptr, sz);
   ptr = tor_mmap_anonymous(sz, ANONMAP_NOINHERIT, );
   tt_ptr_op(ptr, OP_NE, 0);
-  memset(ptr, TEST_VALUE, sz);
+  memset(ptr, (uint8_t)TEST_VALUE, sz);
 
   tt_int_op(0, OP_EQ, pipe(pipefd));
   pid_t child = fork();



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

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

2019-10-03 Thread translation

commit 8681d0d9f552887ac2cb81ae49909c4061b08014
Author: Translation commit bot 
Date:   Fri Oct 4 01:16:11 2019 +

https://gitweb.torproject.org/translation.git/commit/?h=bridgedb_completed
---
 nl/LC_MESSAGES/bridgedb.po | 141 +
 templates/bridgedb.pot | 257 +++--
 2 files changed, 204 insertions(+), 194 deletions(-)

diff --git a/nl/LC_MESSAGES/bridgedb.po b/nl/LC_MESSAGES/bridgedb.po
index 134823124..bee1cf912 100644
--- a/nl/LC_MESSAGES/bridgedb.po
+++ b/nl/LC_MESSAGES/bridgedb.po
@@ -1,9 +1,8 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
 # 
 # Translators:
-# Translators:
 # Adriaan Callaerts , 2013
 # AndrÃ© Koot , 2016
 # Ann Boen , 2014
@@ -13,7 +12,8 @@
 # Johann Behrens , 2013
 # Joren Vandeweyer , 2019
 # 53a60eabbf5124a226a7678001f9a57b, 2015
-# Meteor0id, 2019
+# Meteor 0id, 2019
+# Meteor 0id, 2019
 # Not Much <1028484728...@protonmail.com>, 2018
 # Shondoit Walker , 2011
 # Marco Brohet , 2012
@@ -26,17 +26,36 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 
'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB=bridgedb-reported,msgid=isis,sysrqb=isis'\n"
-"POT-Creation-Date: 2015-07-25 03:40+\n"
-"PO-Revision-Date: 2019-09-09 13:57+\n"
-"Last-Translator: Meteor0id\n"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: 2019-10-04 01:01+\n"
+"Last-Translator: Meteor 0id\n"
 "Language-Team: Dutch (http://www.transifex.com/otf/torproject/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.7.0\n"
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates.  (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : Localisations which BridgeDB supports which should be rendered right-to-
+#. left.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
 #. "BridgeDB"
@@ -48,35 +67,31 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
 msgid "Sorry! Something went wrong with your request."
 msgstr "Sorry! Er is iets misgegaan met uw aanvraag."
 
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
 msgid "Report a Bug"
 msgstr "Een bug melden"
 
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
 msgid "Source Code"
 msgstr "Broncode"
 
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:85
 msgid "Changelog"
 msgstr "Lijst van wijzigingen"
 
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Contact"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
 msgid "Select All"
 msgstr "Alles selecteren"
 
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
 msgid "Show QRCode"
 msgstr "QRCode tonen"
 
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"
 msgstr "QRCode voor uw bridge regels"
 
@@ -84,58 +99,58 @@ msgstr "QRCode voor uw bridge regels"
 #. "There was a problem!" in your language. For example,
 #. for Italian, you might translate this into "Mama mia!",
 #. or for French: "Sacrebleu!". :)
-#: bridgedb/https/templates/bridges.html:67
-#: bridgedb/https/templates/bridges.html:125
+#:

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

2019-10-03 Thread translation

commit 34e5a28eb91c7f0d44b3a6015f11a5f20161bd55
Author: Translation commit bot 
Date:   Fri Oct 4 00:22:13 2019 +


https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-properties
---
 mk/torlauncher.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mk/torlauncher.properties b/mk/torlauncher.properties
index ec567c582..806ac8d57 100644
--- a/mk/torlauncher.properties
+++ b/mk/torlauncher.properties
@@ -67,7 +67,7 @@ torlauncher.bootstrapStatus.loading_status=ÐÑÐ¸ÑÑÐ²Ð°ÑÐµ 
Ð½Ð° Ð¼ÑÐµÐ¶ÐµÐ½
 torlauncher.bootstrapStatus.loading_keys=ÐÑÐ¸ÑÑÐ²Ð°ÑÐµ Ð½Ð° 
Ð°Ð²ÑÐ¾ÑÐ¸ÑÐµÑÐ½Ð¸ ÑÐµÑÑÐ¸ÑÐ¸ÐºÐ°ÑÐ¸
 torlauncher.bootstrapStatus.requesting_descriptors=ÐÐ°ÑÐ°ÑÐµ Ð½Ð° 
Ð¸Ð½ÑÐ¾ÑÐ¼Ð°ÑÐ¸Ð¸ Ð·Ð° ÑÐµÐ»Ðµ
 torlauncher.bootstrapStatus.loading_descriptors=ÐÑÐ¸ÑÑÐ²Ð°ÑÐµ Ð½Ð° 
Ð¸Ð½ÑÐ¾ÑÐ¼Ð°ÑÐ¸Ð¸ Ð·Ð° ÑÐµÐ»Ðµ
-torlauncher.bootstrapStatus.enough_dirinfo=ÐÐ°Ð²ÑÑÐµÐ½Ð¾ 
Ð²ÑÐ¸ÑÑÐ²Ð°ÑÐµÑÐ¾ Ð½Ð° Ð¸Ð½ÑÐ¾ÑÐ¼Ð°ÑÐ¸Ð¸ Ð·Ð° ÑÐµÐ»ÐµÑÐ¾
+torlauncher.bootstrapStatus.enough_dirinfo=ÐÐ°Ð²ÑÑÐµÐ½Ð¾ Ðµ 
Ð²ÑÐ¸ÑÑÐ²Ð°ÑÐµÑÐ¾ Ð½Ð° Ð¸Ð½ÑÐ¾ÑÐ¼Ð°ÑÐ¸Ð¸ÑÐµ Ð·Ð° ÑÐµÐ»ÐµÑÐ¾
 torlauncher.bootstrapStatus.ap_conn_pt=ÐÑÐ°Ð´ÐµÑÐµ ÐºÑÑÐ³Ð¾Ð²Ð¸: 
ÐÐ¾Ð²ÑÐ·ÑÐ²Ð°ÑÐµ ÑÐ¾ Ð¼Ð¾ÑÑ
 torlauncher.bootstrapStatus.ap_conn_done_pt=ÐÑÐ°Ð´ÐµÑÐµ ÐºÑÑÐ³Ð¾Ð²Ð¸: 
ÐÐ¾Ð²ÑÐ·Ð°Ð½ ÑÐ¾ Ð¼Ð¾ÑÑ
 torlauncher.bootstrapStatus.ap_conn_proxy=ÐÑÐ°Ð´ÐµÑÐµ ÐºÑÑÐ³Ð¾Ð²Ð¸: 
ÐÐ¾Ð²ÑÐ·ÑÐ²Ð°ÑÐµ ÑÐ¾ Ð¿ÑÐ¾ÐºÑÐ¸

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

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

2019-10-03 Thread translation

commit 05f78d94d32b71682ec4a057acf76302aa8b0346
Author: Translation commit bot 
Date:   Fri Oct 4 00:22:20 2019 +


https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-properties_completed
---
 mk/torlauncher.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mk/torlauncher.properties b/mk/torlauncher.properties
index ec567c582..806ac8d57 100644
--- a/mk/torlauncher.properties
+++ b/mk/torlauncher.properties
@@ -67,7 +67,7 @@ torlauncher.bootstrapStatus.loading_status=ÐÑÐ¸ÑÑÐ²Ð°ÑÐµ 
Ð½Ð° Ð¼ÑÐµÐ¶ÐµÐ½
 torlauncher.bootstrapStatus.loading_keys=ÐÑÐ¸ÑÑÐ²Ð°ÑÐµ Ð½Ð° 
Ð°Ð²ÑÐ¾ÑÐ¸ÑÐµÑÐ½Ð¸ ÑÐµÑÑÐ¸ÑÐ¸ÐºÐ°ÑÐ¸
 torlauncher.bootstrapStatus.requesting_descriptors=ÐÐ°ÑÐ°ÑÐµ Ð½Ð° 
Ð¸Ð½ÑÐ¾ÑÐ¼Ð°ÑÐ¸Ð¸ Ð·Ð° ÑÐµÐ»Ðµ
 torlauncher.bootstrapStatus.loading_descriptors=ÐÑÐ¸ÑÑÐ²Ð°ÑÐµ Ð½Ð° 
Ð¸Ð½ÑÐ¾ÑÐ¼Ð°ÑÐ¸Ð¸ Ð·Ð° ÑÐµÐ»Ðµ
-torlauncher.bootstrapStatus.enough_dirinfo=ÐÐ°Ð²ÑÑÐµÐ½Ð¾ 
Ð²ÑÐ¸ÑÑÐ²Ð°ÑÐµÑÐ¾ Ð½Ð° Ð¸Ð½ÑÐ¾ÑÐ¼Ð°ÑÐ¸Ð¸ Ð·Ð° ÑÐµÐ»ÐµÑÐ¾
+torlauncher.bootstrapStatus.enough_dirinfo=ÐÐ°Ð²ÑÑÐµÐ½Ð¾ Ðµ 
Ð²ÑÐ¸ÑÑÐ²Ð°ÑÐµÑÐ¾ Ð½Ð° Ð¸Ð½ÑÐ¾ÑÐ¼Ð°ÑÐ¸Ð¸ÑÐµ Ð·Ð° ÑÐµÐ»ÐµÑÐ¾
 torlauncher.bootstrapStatus.ap_conn_pt=ÐÑÐ°Ð´ÐµÑÐµ ÐºÑÑÐ³Ð¾Ð²Ð¸: 
ÐÐ¾Ð²ÑÐ·ÑÐ²Ð°ÑÐµ ÑÐ¾ Ð¼Ð¾ÑÑ
 torlauncher.bootstrapStatus.ap_conn_done_pt=ÐÑÐ°Ð´ÐµÑÐµ ÐºÑÑÐ³Ð¾Ð²Ð¸: 
ÐÐ¾Ð²ÑÐ·Ð°Ð½ ÑÐ¾ Ð¼Ð¾ÑÑ
 torlauncher.bootstrapStatus.ap_conn_proxy=ÐÑÐ°Ð´ÐµÑÐµ ÐºÑÑÐ³Ð¾Ð²Ð¸: 
ÐÐ¾Ð²ÑÐ·ÑÐ²Ð°ÑÐµ ÑÐ¾ Ð¿ÑÐ¾ÐºÑÐ¸

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

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

2019-10-03 Thread translation

commit 118749c60179e0dfcf2087470275c0391e978ce4
Author: Translation commit bot 
Date:   Fri Oct 4 00:21:01 2019 +


https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbuttonproperties_completed
---
 mk/torbutton.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mk/torbutton.properties b/mk/torbutton.properties
index db22bd11d..58ea73ec2 100644
--- a/mk/torbutton.properties
+++ b/mk/torbutton.properties
@@ -29,7 +29,7 @@ torbutton.popup.short_torbrowser = ÐÐ°Ð¶Ð½Ð° Torbutton 
Ð¸Ð½ÑÐ¾ÑÐ¼Ð°ÑÐ¸ÑÐ°!\
 
 torbutton.popup.confirm_plugins = ÐÑÐ¸ÐºÐ»ÑÑÐ¾ÑÐ¸ÑÐµ ÐºÐ°ÐºÐ¾ Flash 
Ð¼Ð¾Ð¶Ð°Ñ Ð´Ð° ÑÐ° Ð¿Ð¾Ð²ÑÐµÐ´Ð°Ñ Ð²Ð°ÑÐ°ÑÐ° Ð¿ÑÐ¸Ð²Ð°ÑÐ½Ð¾ÑÑ Ð¸ 
Ð°Ð½Ð¾Ð½Ð¸Ð¼Ð½Ð¾ÑÑ.\n\nÐ¢Ð¸Ðµ Ð¼Ð¾Ð¶Ð°Ñ Ð¸ÑÑÐ¾ ÑÐ°ÐºÐ° Ð´Ð° Ð³Ð¾ 
Ð·Ð°Ð¾Ð±Ð¸ÐºÐ¾Ð»Ð°Ñ Tor Ð¸ Ð´Ð° ÑÐ° Ð¾ÑÐºÑÐ¸ÑÐ°Ñ Ð²Ð°Ð¶Ð°ÑÐ° 
Ð»Ð¾ÐºÐ°ÑÐ¸ÑÐ° Ð¸ IP Ð°Ð´ÑÐµÑÐ°ÑÐ°.\n\nÐÐ°Ð»Ð¸ ÑÑÐµ ÑÐ¸Ð³ÑÑÐ½Ð¸ 
Ð´ÐµÐºÐ° ÑÐ°ÐºÐ°ÑÐµ Ð´Ð° Ð³Ð¸ Ð¾Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð¸ÑÐµ 
Ð¿ÑÐ¸ÐºÐ»ÑÑÐ¾ÑÐ¸ÑÐµ?\n\n
 torbutton.popup.never_ask_again = ÐÐµ Ð¼Ðµ Ð¿ÑÐ°ÑÑÐ²Ð°Ñ Ð½Ð¸ÐºÐ¾Ð³Ð°Ñ 
Ð¿Ð¾Ð²ÐµÑÐµ
-torbutton.popup.confirm_newnym = Tor Browser ÑÐµ Ð³Ð¸ Ð·Ð°ÑÐ²Ð¾ÑÐ¸ ÑÐ¸ÑÐµ 
Ð¿ÑÐ¾Ð·Ð¾ÑÑÐ¸ Ð¸ ÑÐ°Ð±Ð¾Ð²Ð¸. Ð¡Ð¸ÑÐµ Ð²ÐµÐ± ÑÐµÑÐ¸Ð¸ ÑÐµ Ð±Ð¸Ð´Ð°Ñ 
Ð¸Ð·Ð³ÑÐ±ÐµÐ½Ð¸.\n\nÐ ÐµÑÑÐ°ÑÑÐ¸ÑÐ°ÑÑÐµ Ð³Ð¾ Tor Browser ÑÐµÐ³Ð° Ð´Ð° 
Ð³Ð¾ Ð¿ÑÐ¾Ð¼ÐµÐ½Ð¸ÑÐµ Ð²Ð°ÑÐ¸Ð¾Ñ Ð¸Ð´ÐµÐ½ÑÐ¸ÑÐµÑ.\n\n
+torbutton.popup.confirm_newnym = Tor Browser ÑÐµ Ð³Ð¸ Ð·Ð°ÑÐ²Ð¾ÑÐ¸ ÑÐ¸ÑÐµ 
Ð¿ÑÐ¾Ð·Ð¾ÑÑÐ¸ Ð¸ ÑÐ°Ð±Ð¾Ð²Ð¸. Ð¡Ð¸ÑÐµ Ð²ÐµÐ± ÑÐµÑÐ¸Ð¸ ÑÐµ Ð±Ð¸Ð´Ð°Ñ 
Ð¸Ð·Ð³ÑÐ±ÐµÐ½Ð¸.\n\nÐ ÐµÑÑÐ°ÑÑÐ¸ÑÐ°ÑÑÐµ Ð³Ð¾ Tor Browser ÑÐµÐ³Ð° Ð·Ð° 
Ð´Ð° Ð³Ð¾ Ð¿ÑÐ¾Ð¼ÐµÐ½Ð¸ÑÐµ Ð²Ð°ÑÐ¸Ð¾Ñ Ð¸Ð´ÐµÐ½ÑÐ¸ÑÐµÑ.\n\n
 
 torbutton.maximize_warning = ÐÐ°ÐºÑÐ¸Ð¼Ð¸Ð·Ð¸ÑÐ°ÑÐµÑÐ¾ Ð½Ð° Tor Browser 
Ð´Ð¾Ð·Ð²Ð¾Ð»ÑÐ²Ð° Ð½Ð° Ð²ÐµÐ± ÑÑÑÐ°Ð½Ð¸ÑÐµ Ð´Ð° ÑÐ° ÑÑÐ²ÑÐ´Ð°Ñ 
Ð³Ð¾Ð»ÐµÐ¼Ð¸Ð½Ð°ÑÐ° Ð½Ð° Ð²Ð°ÑÐ¸Ð¾Ñ Ð¼Ð¾Ð½Ð¸ÑÐ¾Ñ, ÑÑÐ¾ Ð¿Ð°Ðº Ð¼Ð¾Ð¶Ðµ 
Ð´Ð° ÑÐµ ÐºÐ¾ÑÐ¸ÑÑÐ¸ Ð·Ð° Ð²Ð°ÑÐµ ÑÐ»ÐµÐ´ÐµÑÐµ. ÐÐ¸ 
Ð¿ÑÐµÐ¿Ð¾ÑÐ°ÑÑÐ²Ð°Ð¼Ðµ Ð´Ð° Ð³Ð¸ Ð¾ÑÑÐ°Ð²Ð¸ÑÐµ Ð¿ÑÐ¾Ð·Ð¾ÑÑÐ¸ÑÐµ Ð½Ð° 
Tor Browser Ð²Ð¾ Ð½Ð¸Ð²Ð½Ð°ÑÐ° Ð¾ÑÐ¸Ð³Ð¸Ð½Ð°Ð»Ð½Ð° Ð³Ð¾Ð»ÐµÐ¼Ð¸Ð½Ð°.
 

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

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

2019-10-03 Thread translation

commit c78edb3d3df0723cd581a668eeb04a2fa1b135b4
Author: Translation commit bot 
Date:   Fri Oct 4 00:20:54 2019 +


https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbuttonproperties
---
 mk/torbutton.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mk/torbutton.properties b/mk/torbutton.properties
index db22bd11d..58ea73ec2 100644
--- a/mk/torbutton.properties
+++ b/mk/torbutton.properties
@@ -29,7 +29,7 @@ torbutton.popup.short_torbrowser = ÐÐ°Ð¶Ð½Ð° Torbutton 
Ð¸Ð½ÑÐ¾ÑÐ¼Ð°ÑÐ¸ÑÐ°!\
 
 torbutton.popup.confirm_plugins = ÐÑÐ¸ÐºÐ»ÑÑÐ¾ÑÐ¸ÑÐµ ÐºÐ°ÐºÐ¾ Flash 
Ð¼Ð¾Ð¶Ð°Ñ Ð´Ð° ÑÐ° Ð¿Ð¾Ð²ÑÐµÐ´Ð°Ñ Ð²Ð°ÑÐ°ÑÐ° Ð¿ÑÐ¸Ð²Ð°ÑÐ½Ð¾ÑÑ Ð¸ 
Ð°Ð½Ð¾Ð½Ð¸Ð¼Ð½Ð¾ÑÑ.\n\nÐ¢Ð¸Ðµ Ð¼Ð¾Ð¶Ð°Ñ Ð¸ÑÑÐ¾ ÑÐ°ÐºÐ° Ð´Ð° Ð³Ð¾ 
Ð·Ð°Ð¾Ð±Ð¸ÐºÐ¾Ð»Ð°Ñ Tor Ð¸ Ð´Ð° ÑÐ° Ð¾ÑÐºÑÐ¸ÑÐ°Ñ Ð²Ð°Ð¶Ð°ÑÐ° 
Ð»Ð¾ÐºÐ°ÑÐ¸ÑÐ° Ð¸ IP Ð°Ð´ÑÐµÑÐ°ÑÐ°.\n\nÐÐ°Ð»Ð¸ ÑÑÐµ ÑÐ¸Ð³ÑÑÐ½Ð¸ 
Ð´ÐµÐºÐ° ÑÐ°ÐºÐ°ÑÐµ Ð´Ð° Ð³Ð¸ Ð¾Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð¸ÑÐµ 
Ð¿ÑÐ¸ÐºÐ»ÑÑÐ¾ÑÐ¸ÑÐµ?\n\n
 torbutton.popup.never_ask_again = ÐÐµ Ð¼Ðµ Ð¿ÑÐ°ÑÑÐ²Ð°Ñ Ð½Ð¸ÐºÐ¾Ð³Ð°Ñ 
Ð¿Ð¾Ð²ÐµÑÐµ
-torbutton.popup.confirm_newnym = Tor Browser ÑÐµ Ð³Ð¸ Ð·Ð°ÑÐ²Ð¾ÑÐ¸ ÑÐ¸ÑÐµ 
Ð¿ÑÐ¾Ð·Ð¾ÑÑÐ¸ Ð¸ ÑÐ°Ð±Ð¾Ð²Ð¸. Ð¡Ð¸ÑÐµ Ð²ÐµÐ± ÑÐµÑÐ¸Ð¸ ÑÐµ Ð±Ð¸Ð´Ð°Ñ 
Ð¸Ð·Ð³ÑÐ±ÐµÐ½Ð¸.\n\nÐ ÐµÑÑÐ°ÑÑÐ¸ÑÐ°ÑÑÐµ Ð³Ð¾ Tor Browser ÑÐµÐ³Ð° Ð´Ð° 
Ð³Ð¾ Ð¿ÑÐ¾Ð¼ÐµÐ½Ð¸ÑÐµ Ð²Ð°ÑÐ¸Ð¾Ñ Ð¸Ð´ÐµÐ½ÑÐ¸ÑÐµÑ.\n\n
+torbutton.popup.confirm_newnym = Tor Browser ÑÐµ Ð³Ð¸ Ð·Ð°ÑÐ²Ð¾ÑÐ¸ ÑÐ¸ÑÐµ 
Ð¿ÑÐ¾Ð·Ð¾ÑÑÐ¸ Ð¸ ÑÐ°Ð±Ð¾Ð²Ð¸. Ð¡Ð¸ÑÐµ Ð²ÐµÐ± ÑÐµÑÐ¸Ð¸ ÑÐµ Ð±Ð¸Ð´Ð°Ñ 
Ð¸Ð·Ð³ÑÐ±ÐµÐ½Ð¸.\n\nÐ ÐµÑÑÐ°ÑÑÐ¸ÑÐ°ÑÑÐµ Ð³Ð¾ Tor Browser ÑÐµÐ³Ð° Ð·Ð° 
Ð´Ð° Ð³Ð¾ Ð¿ÑÐ¾Ð¼ÐµÐ½Ð¸ÑÐµ Ð²Ð°ÑÐ¸Ð¾Ñ Ð¸Ð´ÐµÐ½ÑÐ¸ÑÐµÑ.\n\n
 
 torbutton.maximize_warning = ÐÐ°ÐºÑÐ¸Ð¼Ð¸Ð·Ð¸ÑÐ°ÑÐµÑÐ¾ Ð½Ð° Tor Browser 
Ð´Ð¾Ð·Ð²Ð¾Ð»ÑÐ²Ð° Ð½Ð° Ð²ÐµÐ± ÑÑÑÐ°Ð½Ð¸ÑÐµ Ð´Ð° ÑÐ° ÑÑÐ²ÑÐ´Ð°Ñ 
Ð³Ð¾Ð»ÐµÐ¼Ð¸Ð½Ð°ÑÐ° Ð½Ð° Ð²Ð°ÑÐ¸Ð¾Ñ Ð¼Ð¾Ð½Ð¸ÑÐ¾Ñ, ÑÑÐ¾ Ð¿Ð°Ðº Ð¼Ð¾Ð¶Ðµ 
Ð´Ð° ÑÐµ ÐºÐ¾ÑÐ¸ÑÑÐ¸ Ð·Ð° Ð²Ð°ÑÐµ ÑÐ»ÐµÐ´ÐµÑÐµ. ÐÐ¸ 
Ð¿ÑÐµÐ¿Ð¾ÑÐ°ÑÑÐ²Ð°Ð¼Ðµ Ð´Ð° Ð³Ð¸ Ð¾ÑÑÐ°Ð²Ð¸ÑÐµ Ð¿ÑÐ¾Ð·Ð¾ÑÑÐ¸ÑÐµ Ð½Ð° 
Tor Browser Ð²Ð¾ Ð½Ð¸Ð²Ð½Ð°ÑÐ° Ð¾ÑÐ¸Ð³Ð¸Ð½Ð°Ð»Ð½Ð° Ð³Ð¾Ð»ÐµÐ¼Ð¸Ð½Ð°.
 

___
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 'release-0.8.2'

2019-10-03 Thread phw

commit 164f62e5b964c8c52984cb2b15ec4a37be4ef495
Merge: 5ab8ca2 76526a4
Author: Philipp Winter 
Date:   Fri Sep 20 11:41:00 2019 -0700

Merge branch 'release-0.8.2'

 CHANGELOG   |   5 +
 bridgedb/i18n/bn/LC_MESSAGES/bridgedb.po|  18 +-
 bridgedb/i18n/da/LC_MESSAGES/bridgedb.po|   7 +-
 bridgedb/i18n/eo/LC_MESSAGES/bridgedb.po| 327 +++-
 bridgedb/i18n/fa/LC_MESSAGES/bridgedb.po|  38 ++--
 bridgedb/i18n/it/LC_MESSAGES/bridgedb.po|   4 +-
 bridgedb/i18n/ko/LC_MESSAGES/bridgedb.po|  12 +-
 bridgedb/i18n/nl/LC_MESSAGES/bridgedb.po|  91 
 bridgedb/i18n/pt_BR/LC_MESSAGES/bridgedb.po |   3 +-
 bridgedb/i18n/pt_PT/LC_MESSAGES/bridgedb.po |  27 ++-
 bridgedb/i18n/sr/LC_MESSAGES/bridgedb.po|  10 +-
 bridgedb/i18n/zh_CN/LC_MESSAGES/bridgedb.po |  21 +-
 12 files changed, 306 insertions(+), 257 deletions(-)



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

[tor-commits] [bridgedb/develop] Bump version number to 0.8.3.

2019-10-03 Thread phw

commit ad8a95f55879d41cf69456ba1942c9129e315dc4
Author: Philipp Winter 
Date:   Thu Oct 3 15:54:16 2019 -0700

Bump version number to 0.8.3.
---
 CHANGELOG | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 4773a06..be4c6d2 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,4 @@
-Changes in version A.B.C - -MM-DD
+Changes in version 0.8.3 - 2019-10-03
 
 * FIXES https://bugs.torproject.org/31903
 Update existing translations and request new translations.  Thanks to



___
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 'release-0.8.1'

2019-10-03 Thread phw

commit 5ab8ca22678cd65bb99399e7f55fa3ed577f4c10
Merge: bbf1bdc b55c8ca
Author: Philipp Winter 
Date:   Wed Sep 11 14:06:16 2019 -0700

Merge branch 'release-0.8.1'

 CHANGELOG   | 14 ++
 bridgedb/distributors/email/request.py  | 21 +++--
 bridgedb/distributors/https/templates/base.html |  7 ++-
 bridgedb/strings.py |  9 +
 4 files changed, 32 insertions(+), 19 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 'release-0.8.3'

2019-10-03 Thread phw

commit c91498a3287be9717e6a1203e60b9503ad537de8
Merge: 164f62e ad8a95f
Author: Philipp Winter 
Date:   Thu Oct 3 15:56:33 2019 -0700

Merge branch 'release-0.8.3'

 .test.requirements.txt   |  12 +-
 .travis.requirements.txt |  31 +--
 .travis.yml  |  28 +--
 CHANGELOG|  18 ++
 Makefile |   2 +-
 bridgedb/distributors/email/server.py|   3 +-
 bridgedb/distributors/https/server.py|   2 +-
 bridgedb/i18n/fr/LC_MESSAGES/bridgedb.po |   9 +-
 bridgedb/i18n/nl/LC_MESSAGES/bridgedb.po |   2 +-
 bridgedb/i18n/templates/bridgedb.pot | 312 ---
 bridgedb/main.py |   2 +-
 bridgedb/metrics.py  |  13 +-
 bridgedb/test/test_crypto.py |   2 +-
 bridgedb/test/test_email_dkim.py |   2 +-
 bridgedb/test/test_email_server.py   |   2 +-
 bridgedb/test/test_metrics.py|   4 +-
 bridgedb/test/test_persistent.py |   8 +-
 bridgedb/translations.py |   2 +-
 doc/HACKING.md   |  17 ++
 doc/bridgedb-metrics-spec.txt|  74 
 requirements.txt |  26 +--
 scripts/install-dependencies |   5 +-
 22 files changed, 335 insertions(+), 241 deletions(-)

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

[tor-commits] [bridgedb/develop] Add missing CHANGELOG entry from #31903.

2019-10-03 Thread phw

commit ad6e30c12dcc67b751e7cb71404954a9174101f6
Author: Philipp Winter 
Date:   Thu Oct 3 15:48:02 2019 -0700

Add missing CHANGELOG entry from #31903.
---
 CHANGELOG | 4 
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index 48e18eb..4773a06 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,9 @@
 Changes in version A.B.C - -MM-DD
 
+* FIXES https://bugs.torproject.org/31903
+Update existing translations and request new translations.  Thanks to
+all volunteers who helped translate BridgeDB!
+
 * FIXES https://bugs.torproject.org/31780
 We implemented BridgeDB's metrics in #9316 but haven't specified its
 format until now.  In addition to adding a specification, this patch



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

[tor-commits] [bridgedb/master] Order dependencies alphabetically.

2019-10-03 Thread phw

commit c833e9766cfb414b5f4050eb28fba93cb245d976
Author: Philipp Winter 
Date:   Thu Sep 12 16:37:13 2019 -0700

Order dependencies alphabetically.

This makes it easier to create diffs between our various requirements
files.
---
 .travis.requirements.txt | 12 ++--
 requirements.txt |  6 +++---
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.travis.requirements.txt b/.travis.requirements.txt
index 0669dc4..4d451da 100644
--- a/.travis.requirements.txt
+++ b/.travis.requirements.txt
@@ -13,20 +13,20 @@
 # $ make coverage
 #
 #--
-coverage==4.5.4
-coveralls==1.8.2
-mechanize==0.4.3
-sure==1.4.11
 Babel==2.7.0
 BeautifulSoup==3.2.1
 Mako==1.1.0
-ipaddr==2.2.0
-pygeoip==0.3.2
 PyCryptodome==3.9.0
 Twisted==19.7.0
+coverage==4.5.4
+coveralls==1.8.2
 gnupg==2.3.1
+ipaddr==2.2.0
+mechanize==0.4.3
 pillow==6.1.0
+pygeoip==0.3.2
 qrcode==6.1
 service_identity==18.1.0
 stem==1.7.1
+sure==1.4.11
 zope.interface==4.6.0
diff --git a/requirements.txt b/requirements.txt
index ebf9c96..05d5444 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,13 +1,13 @@
 Babel==2.7.0
 BeautifulSoup==3.2.1
 Mako==1.1.0
+PyCryptodome==3.9.0
 Twisted==19.7.0
+gnupg==2.3.1
 ipaddr==2.2.0
+pillow>=6.1.0
 pyOpenSSL==19.0.0
 pygeoip==0.3.2
-PyCryptodome==3.9.0
-gnupg==2.3.1
-pillow>=6.1.0
 qrcode==6.1
 service_identity==18.1.0
 stem==1.7.1



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

[tor-commits] [bridgedb/master] Add missing CHANGELOG entry from #31903.

2019-10-03 Thread phw

commit ad6e30c12dcc67b751e7cb71404954a9174101f6
Author: Philipp Winter 
Date:   Thu Oct 3 15:48:02 2019 -0700

Add missing CHANGELOG entry from #31903.
---
 CHANGELOG | 4 
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index 48e18eb..4773a06 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,9 @@
 Changes in version A.B.C - -MM-DD
 
+* FIXES https://bugs.torproject.org/31903
+Update existing translations and request new translations.  Thanks to
+all volunteers who helped translate BridgeDB!
+
 * FIXES https://bugs.torproject.org/31780
 We implemented BridgeDB's metrics in #9316 but haven't specified its
 format until now.  In addition to adding a specification, this patch



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

[tor-commits] [bridgedb/master] Merge branch 'release-0.8.3'

2019-10-03 Thread phw

commit c91498a3287be9717e6a1203e60b9503ad537de8
Merge: 164f62e ad8a95f
Author: Philipp Winter 
Date:   Thu Oct 3 15:56:33 2019 -0700

Merge branch 'release-0.8.3'

 .test.requirements.txt   |  12 +-
 .travis.requirements.txt |  31 +--
 .travis.yml  |  28 +--
 CHANGELOG|  18 ++
 Makefile |   2 +-
 bridgedb/distributors/email/server.py|   3 +-
 bridgedb/distributors/https/server.py|   2 +-
 bridgedb/i18n/fr/LC_MESSAGES/bridgedb.po |   9 +-
 bridgedb/i18n/nl/LC_MESSAGES/bridgedb.po |   2 +-
 bridgedb/i18n/templates/bridgedb.pot | 312 ---
 bridgedb/main.py |   2 +-
 bridgedb/metrics.py  |  13 +-
 bridgedb/test/test_crypto.py |   2 +-
 bridgedb/test/test_email_dkim.py |   2 +-
 bridgedb/test/test_email_server.py   |   2 +-
 bridgedb/test/test_metrics.py|   4 +-
 bridgedb/test/test_persistent.py |   8 +-
 bridgedb/translations.py |   2 +-
 doc/HACKING.md   |  17 ++
 doc/bridgedb-metrics-spec.txt|  74 
 requirements.txt |  26 +--
 scripts/install-dependencies |   5 +-
 22 files changed, 335 insertions(+), 241 deletions(-)

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

[tor-commits] [bridgedb/master] Add specification for BridgeDB's metrics format.

2019-10-03 Thread phw

commit 39b6285b28e2826af09bce6a3563f0b1138eac7e
Author: Philipp Winter 
Date:   Wed Sep 18 13:42:47 2019 -0700

Add specification for BridgeDB's metrics format.

We implemented BridgeDB's metrics in 
but haven't specified its format until this patch.

This patch also makes our implementation consistent with our (slightly
updated) specification.  In particular:

* For naming consistency, we changed "bridgedb-stats-version" to
  "bridgedb-metrics-version" and "bridgedb-stats-end" to
  "bridgedb-metrics-end".

* For simplicity, we also changed our version from a major and minor
  number to a single number.

* Instead of appending to our metrics file, we now overwrite the file
  because our specification requires "bridgedb-metrics-end" and
  "bridgedb-metrics-version" to be there exactly once.
---
 CHANGELOG |  8 +
 bridgedb/main.py  |  2 +-
 bridgedb/metrics.py   | 13 
 bridgedb/test/test_metrics.py |  4 +--
 doc/bridgedb-metrics-spec.txt | 74 +++
 5 files changed, 91 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 06968d2..c2fca89 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,11 @@
+Changes in version A.B.C - -MM-DD
+
+* FIXES https://bugs.torproject.org/31780
+We implemented BridgeDB's metrics in #9316 but haven't specified its
+format until now.  In addition to adding a specification, this patch
+also makes our implementation consistent with our (slightly updated)
+specification.
+
 Changes in version 0.8.2 - 2019-09-20
 
 Updated translations for the following languages:
diff --git a/bridgedb/main.py b/bridgedb/main.py
index 94f4921..7c2df6d 100644
--- a/bridgedb/main.py
+++ b/bridgedb/main.py
@@ -85,7 +85,7 @@ def writeMetrics(filename, measurementInterval):
 logging.debug("Dumping metrics to file: '%s'" % filename)
 
 try:
-with open(filename, 'a') as fh:
+with open(filename, 'w') as fh:
 metrics.export(fh, measurementInterval)
 except IOError as err:
 logging.error("Failed to write metrics to '%s': %s" % (filename, err))
diff --git a/bridgedb/metrics.py b/bridgedb/metrics.py
index 4e1c880..5e14146 100644
--- a/bridgedb/metrics.py
+++ b/bridgedb/metrics.py
@@ -9,7 +9,7 @@
 # :license: see LICENSE for licensing information
 # _
 
-"""API for keeping track of BridgeDB statistics, e.g., the demand for bridges
+"""API for keeping track of BridgeDB metrics, e.g., the demand for bridges
 over time.
 """
 
@@ -53,9 +53,9 @@ SUBNET_CTR_PREFIX_LEN = 20
 # All of the pluggable transports BridgeDB currently supports.
 SUPPORTED_TRANSPORTS = None
 
-# Major and minor version number for our statistics format.
-METRICS_MAJOR_VERSION = 1
-METRICS_MINOR_VERSION = 0
+# Version number for our metrics format.  We increment the version if our
+# format changes.
+METRICS_VERSION = 1
 
 
 def setProxies(proxies):
@@ -120,11 +120,10 @@ def export(fh, measurementInterval):
 logging.debug("Metrics module knows about %d proxies." % numProxies)
 
 now = datetime.datetime.utcnow()
-fh.write("bridgedb-stats-end %s (%d s)\n" % (
+fh.write("bridgedb-metrics-end %s (%d s)\n" % (
  now.strftime("%Y-%m-%d %H:%M:%S"),
  measurementInterval))
-fh.write("bridgedb-stats-version %d.%d\n" % (METRICS_MAJOR_VERSION,
- METRICS_MINOR_VERSION))
+fh.write("bridgedb-metrics-version %d\n" % METRICS_VERSION)
 
 httpsLines = httpsMetrix.getMetrics()
 for line in httpsLines:
diff --git a/bridgedb/test/test_metrics.py b/bridgedb/test/test_metrics.py
index a870fc2..a27431c 100644
--- a/bridgedb/test/test_metrics.py
+++ b/bridgedb/test/test_metrics.py
@@ -110,8 +110,8 @@ class StateTest(unittest.TestCase):
 self.assertTrue(len(pseudo_fh.getvalue()) > 0)
 
 lines = pseudo_fh.getvalue().split("\n")
-self.assertTrue(lines[0].startswith("bridgedb-stats-end"))
-self.assertTrue(lines[1].startswith("bridgedb-stats-version"))
+self.assertTrue(lines[0].startswith("bridgedb-metrics-end"))
+self.assertTrue(lines[1].startswith("bridgedb-metrics-version"))
 self.assertTrue(lines[2] ==
 "bridgedb-metric-count https.obfs4.de.success.None 10")
 
diff --git a/doc/bridgedb-metrics-spec.txt b/doc/bridgedb-metrics-spec.txt
new file mode 100644
index 000..14c38f9
--- /dev/null
+++ b/doc/bridgedb-metrics-spec.txt
@@ -0,0 +1,74 @@
+  BridgeDB metrics (version 1)
+
+BridgeDB exports usage metrics once every 24 hours.  These metrics
+encode how many approximate successful/failed requests BridgeDB has seen
+per distribution mechanism, per pluggable transport, per country code

[tor-commits] [bridgedb/master] Merge branch 'fix/29484' into develop

2019-10-03 Thread phw

commit 53bcb77571c7a1f6c60bef44fefb1ef39cd65c7f
Merge: 44d6ed3 edf27d1
Author: Philipp Winter 
Date:   Thu Oct 3 15:34:57 2019 -0700

Merge branch 'fix/29484' into develop

 .test.requirements.txt| 12 +---
 .travis.requirements.txt  | 31 ---
 .travis.yml   | 28 ++--
 CHANGELOG |  6 ++
 Makefile  |  2 +-
 bridgedb/distributors/email/server.py |  3 ++-
 bridgedb/distributors/https/server.py |  2 +-
 bridgedb/test/test_crypto.py  |  2 +-
 bridgedb/test/test_email_dkim.py  |  2 +-
 bridgedb/test/test_email_server.py|  2 +-
 bridgedb/test/test_persistent.py  |  8 
 bridgedb/translations.py  |  2 +-
 doc/HACKING.md| 17 +
 requirements.txt  | 26 +-
 scripts/install-dependencies  |  5 ++---
 15 files changed, 73 insertions(+), 75 deletions(-)



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

[tor-commits] [bridgedb/master] Update to pylint version 2.4.2.

2019-10-03 Thread phw

commit 2d3ef0a8ce5a01ff641aed43efd90d49405a42fd
Author: Philipp Winter 
Date:   Thu Sep 12 15:56:19 2019 -0700

Update to pylint version 2.4.2.

The bug that was once the reason to stick with version 1.1.0 has seen
been resolved: 
---
 .test.requirements.txt | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.test.requirements.txt b/.test.requirements.txt
index 2b6da2f..298d61a 100644
--- a/.test.requirements.txt
+++ b/.test.requirements.txt
@@ -8,7 +8,5 @@
 coverage==4.5.4
 mechanize==0.4.3
 pep8==1.7.1
-# pylint must be pinned until pylint bug #203 is fixed. See
-# 
https://bitbucket.org/logilab/pylint/issue/203/importing-namespace-packages-crashes#comment-11013783
-pylint==1.1.0
+pylint==2.4.2
 sure==1.4.11



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

[tor-commits] [bridgedb/master] Use canonical package names.

2019-10-03 Thread phw

commit 14dfd92ec825b1689da4b5c3438463249a37b9a0
Author: Philipp Winter 
Date:   Tue Oct 1 10:10:58 2019 -0700

Use canonical package names.

Let's capitalise packages correctly.
---
 .travis.requirements.txt | 4 ++--
 requirements.txt | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.travis.requirements.txt b/.travis.requirements.txt
index 4d451da..3e768d2 100644
--- a/.travis.requirements.txt
+++ b/.travis.requirements.txt
@@ -16,14 +16,14 @@
 Babel==2.7.0
 BeautifulSoup==3.2.1
 Mako==1.1.0
-PyCryptodome==3.9.0
+pycryptodome==3.9.0
 Twisted==19.7.0
 coverage==4.5.4
 coveralls==1.8.2
 gnupg==2.3.1
 ipaddr==2.2.0
 mechanize==0.4.3
-pillow==6.1.0
+Pillow==6.1.0
 pygeoip==0.3.2
 qrcode==6.1
 service_identity==18.1.0
diff --git a/requirements.txt b/requirements.txt
index d5a3c9f..6944d1a 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,11 +1,11 @@
 Babel==2.7.0
 BeautifulSoup==3.2.1
 Mako==1.1.0
-PyCryptodome==3.9.0
+pycryptodome==3.9.0
 Twisted==19.7.0
 gnupg==2.3.1
 ipaddr==2.2.0
-pillow==6.1.0
+Pillow==6.1.0
 pyOpenSSL==19.0.0
 pygeoip==0.3.2
 qrcode==6.1



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

[tor-commits] [bridgedb/master] Add instructions on how to update dependencies.

2019-10-03 Thread phw

commit 73053db105605f74af02f9475ef30377b74be89d
Author: Philipp Winter 
Date:   Wed Oct 2 09:48:14 2019 -0700

Add instructions on how to update dependencies.
---
 doc/HACKING.md | 17 +
 1 file changed, 17 insertions(+)

diff --git a/doc/HACKING.md b/doc/HACKING.md
index a8ec640..5993696 100644
--- a/doc/HACKING.md
+++ b/doc/HACKING.md
@@ -34,6 +34,22 @@ we make are:
 
 ## Making a release
 
+### Updating dependencies
+
+We maintain three requirements.txt files:
+
+* requirements.txt (for BridgeDB)
+* .travis.requirements.txt (for Travis CI)
+* .test.requirements.txt (for unit tests)
+
+Each of these files contains pinned dependencies, which are guaranteed to work
+for a given release.  Before releasing a new version of BridgeDB, we should
+update our dependencies.  The tool [pur][pur] (available through pip) helps us
+with this.  It checks a given requirements.txt file and updates each dependency
+to its latest version:
+
+pur -r REQUIREMENTS_FILE
+
 ### Bumping the version number
 
 Bumping the version number at release time (which, for BridgeDB really means
@@ -67,3 +83,4 @@ References
 --
 [trac]: 
https://trac.torproject.org/projects/tor/query?status=!closed=Circumvention%2FBridgeDB
 [workflow]: https://nvie.com/posts/a-successful-git-branching-model/
+[pur]: https://pypi.org/project/pur/



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

[tor-commits] [bridgedb/master] Adapt to sure's new API.

2019-10-03 Thread phw

commit 5d3a30aceaaf40507cfd63239183edbf27772abb
Author: Philipp Winter 
Date:   Thu Sep 12 14:59:45 2019 -0700

Adapt to sure's new API.
---
 bridgedb/test/test_persistent.py | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/bridgedb/test/test_persistent.py b/bridgedb/test/test_persistent.py
index 95abf61..858ad1a 100644
--- a/bridgedb/test/test_persistent.py
+++ b/bridgedb/test/test_persistent.py
@@ -89,7 +89,7 @@ class StateTest(unittest.TestCase):
 this(self.state).should.have.property('statefile')
 
 def test_persistent_getState(self):
-persistent.should.have.property('_getState').being(callable)
+persistent._getState.should.be.callable
 this(persistent._getState()).should.be.a(persistent.State)
 
 def test_getStateFor(self):
@@ -102,10 +102,10 @@ class StateTest(unittest.TestCase):
 the(self.state.statefile).should.be.a(str)
 
 def test_existsSave(self):
-this(self.state).should.have.property('save').being(callable)
+self.state.save.should.be.callable
 
 def test_existsLoad(self):
-persistent.should.have.property('load').being(callable)
+persistent.load.should.be.callable
 
 def test_persistent_state(self):
 the(persistent._state).should.be.a(persistent.State)
@@ -152,7 +152,7 @@ class StateTest(unittest.TestCase):
 the(thatConfig.LOGFILE).must.equal(42)
 
 the(thatState).should.have.property('useChangedSettings')
-the(thatState.useChangedSettings).should.be(callable)
+thatState.useChangedSettings.should.be.callable
 thatState.useChangedSettings(thatConfig)
 
 the(thatState.FOO).should.equal('fu')



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

[tor-commits] [bridgedb/master] Send CI notifications to phw instead of sysrqb.

2019-10-03 Thread phw

commit f24ef482e8a11beeb8ab4e330f47e82b5e9c0db8
Author: Philipp Winter 
Date:   Thu Sep 12 15:45:33 2019 -0700

Send CI notifications to phw instead of sysrqb.
---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 9d30d10..9ec71fc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,7 +11,7 @@ notifications:
 on_failure: always
   email:
 recipients:
-  - sys...@torproject.org
+  - p...@torproject.org
 on_success: never
 on_failure: change
 



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

[tor-commits] [bridgedb/master] Update stem to version 1.7.1.

2019-10-03 Thread phw

commit 434a30262cc2afabb69fb7bbf2d04c51c9082de4
Author: Philipp Winter 
Date:   Thu Sep 12 16:32:21 2019 -0700

Update stem to version 1.7.1.

There's no reason to use the Tor Project's git repository.
---
 .travis.requirements.txt | 2 +-
 requirements.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.requirements.txt b/.travis.requirements.txt
index 2f8d861..0669dc4 100644
--- a/.travis.requirements.txt
+++ b/.travis.requirements.txt
@@ -28,5 +28,5 @@ gnupg==2.3.1
 pillow==6.1.0
 qrcode==6.1
 service_identity==18.1.0
-git+https://git.torproject.org/stem.git@3eb59411781c4fa210979cb112b800c001a59f6c#egg=stem-1.5.4.dev1-py2.7
+stem==1.7.1
 zope.interface==4.6.0
diff --git a/requirements.txt b/requirements.txt
index 3bb970e..ebf9c96 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -10,5 +10,5 @@ gnupg==2.3.1
 pillow>=6.1.0
 qrcode==6.1
 service_identity==18.1.0
-git+https://git.torproject.org/stem.git@3eb59411781c4fa210979cb112b800c001a59f6c#egg=stem-1.5.4.dev1-py2.7
+stem==1.7.1
 zope.interface==4.6.0



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

[tor-commits] [bridgedb/master] Update libraries to their latest versions.

2019-10-03 Thread phw

commit bd847b3409cf0fa2fd9854d92383e43994739893
Author: Philipp Winter 
Date:   Thu Sep 12 14:38:50 2019 -0700

Update libraries to their latest versions.

This patch updates all of our less problematic libraries to their latest
respective versions.  We can determine a library's latest version by
running:

  yolk -V LIBRARY

You can run 'pip install yolk' if you don't have the tool installed
already.
---
 .test.requirements.txt   |  8 
 .travis.requirements.txt | 28 ++--
 requirements.txt | 24 
 3 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/.test.requirements.txt b/.test.requirements.txt
index ad5342f..2b6da2f 100644
--- a/.test.requirements.txt
+++ b/.test.requirements.txt
@@ -5,10 +5,10 @@
 # $ pip install -r .test.requirements.txt
 # $ make coverage
 #
-coverage==4.2
-mechanize==0.2.5
-pep8==1.5.7
+coverage==4.5.4
+mechanize==0.4.3
+pep8==1.7.1
 # pylint must be pinned until pylint bug #203 is fixed. See
 # 
https://bitbucket.org/logilab/pylint/issue/203/importing-namespace-packages-crashes#comment-11013783
 pylint==1.1.0
-sure==1.2.2
+sure==1.4.11
diff --git a/.travis.requirements.txt b/.travis.requirements.txt
index 5c1e433..9d69ab7 100644
--- a/.travis.requirements.txt
+++ b/.travis.requirements.txt
@@ -13,19 +13,19 @@
 # $ make coverage
 #
 #--
-coverage==4.2
-coveralls==1.2.0
-mechanize==0.2.5
-sure==1.2.2
-Babel==0.9.6
+coverage==4.5.4
+coveralls==1.8.2
+mechanize==0.4.3
+sure==1.4.11
+Babel==2.7.0
 BeautifulSoup==3.2.1
-Mako==0.8.1
-ipaddr==2.1.11
-pygeoip==0.2.7
-PyCryptodome==3.8.2
-gnupg==2.0.1
-pillow>=2.6.1
-qrcode==5.0.1
-service_identity==14.0.0
+Mako==1.1.0
+ipaddr==2.2.0
+pygeoip==0.3.2
+PyCryptodome==3.9.0
+gnupg==2.3.1
+pillow==6.1.0
+qrcode==6.1
+service_identity==18.1.0
 
git+https://git.torproject.org/stem.git@3eb59411781c4fa210979cb112b800c001a59f6c#egg=stem-1.5.4.dev1-py2.7
-zope.interface==3.6.1
+zope.interface==4.6.0
diff --git a/requirements.txt b/requirements.txt
index 0ceccca..1b25a90 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,14 +1,14 @@
-Babel==2.5.1
+Babel==2.7.0
 BeautifulSoup==3.2.1
-Mako==0.8.1
-Twisted==16.1.1
-ipaddr==2.1.11
-pyOpenSSL==17.5.0
-pygeoip==0.2.7
-PyCryptodome==3.8.2
-gnupg==2.0.1
-pillow>=2.6.1
-qrcode==5.0.1
-service_identity==14.0.0
+Mako==1.1.0
+Twisted==16.6.0
+ipaddr==2.2.0
+pyOpenSSL==19.0.0
+pygeoip==0.3.2
+PyCryptodome==3.9.0
+gnupg==2.3.1
+pillow>=6.1.0
+qrcode==6.1
+service_identity==18.1.0
 
git+https://git.torproject.org/stem.git@3eb59411781c4fa210979cb112b800c001a59f6c#egg=stem-1.5.4.dev1-py2.7
-zope.interface==3.6.1
+zope.interface==4.6.0



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

[tor-commits] [bridgedb/master] Update Twisted to 19.7.0.

2019-10-03 Thread phw

commit 4ee54ce81a5ef7466067f3637258e4aa6de541bc
Author: Philipp Winter 
Date:   Thu Sep 12 16:27:11 2019 -0700

Update Twisted to 19.7.0.

In the process, we can also get rid of our build matrix because
there's no longer a need to test different Twisted (or pyOpenSSL)
versions.

We had to fix a number of issues to support the latest Twisted version:

* Change Reactor() to createReactor() in a unit test.

* Invoke unit tests with "-m twisted.trial" instead of "$(TRIAL)" to
  unbreak our code coverage reporting.

* Use absolute paths for our translations because otherwise our new
  unit test invocation with "-m twisted.trial" would look in the wrong
  place and fail.
---
 .travis.requirements.txt  |  1 +
 .travis.yml   | 26 +-
 Makefile  |  2 +-
 bridgedb/distributors/https/server.py |  2 +-
 bridgedb/test/test_crypto.py  |  2 +-
 bridgedb/translations.py  |  2 +-
 requirements.txt  |  2 +-
 scripts/install-dependencies  |  5 ++---
 8 files changed, 9 insertions(+), 33 deletions(-)

diff --git a/.travis.requirements.txt b/.travis.requirements.txt
index 9d69ab7..2f8d861 100644
--- a/.travis.requirements.txt
+++ b/.travis.requirements.txt
@@ -23,6 +23,7 @@ Mako==1.1.0
 ipaddr==2.2.0
 pygeoip==0.3.2
 PyCryptodome==3.9.0
+Twisted==19.7.0
 gnupg==2.3.1
 pillow==6.1.0
 qrcode==6.1
diff --git a/.travis.yml b/.travis.yml
index 9ec71fc..c0499b0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -32,30 +32,6 @@ env:
 # 
https://stackoverflow.com/questions/2192323/what-is-the-python-egg-cache-python-egg-cache
 # https://github.com/pypa/virtualenv/issues/459
 - PYTHON_EGG_CACHE="${HOME}/.python-eggs-$(echo $RANDOM$PPID$RANDOM | 
sha256sum | cut -d ' ' -f 1)"
-  matrix:
-# What we're running on polyanthum
-- TWISTED_VERSION=16.1.1 PYOPENSSL_VERSION=17.5.0
-# Debian Stretch
-- TWISTED_VERSION=16.6.0 PYOPENSSL_VERSION=17.5.0
-# Debian experimental (all other versions of Debian have the same 
dependency versions right now)
-- TWISTED_VERSION=17.1.0 PYOPENSSL_VERSION=17.5.0
-
-matrix:
-  include:
-- python: "pypy"
-  env: TWISTED_VERSION=16.1.1 PYOPENSSL_VERSION=17.5.0
-- python: "pypy"
-  env: TWISTED_VERSION=16.6.0 PYOPENSSL_VERSION=17.5.0
-  allow_failures:
-- python: "2.7"
-  env: TWISTED_VERSION=16.6.0 PYOPENSSL_VERSION=17.5.0
-- python: "2.7"
-  env: TWISTED_VERSION=17.1.0 PYOPENSSL_VERSION=17.5.0
-- python: "pypy"
-  env: TWISTED_VERSION=16.1.1 PYOPENSSL_VERSION=17.5.0
-- python: "pypy"
-  env: TWISTED_VERSION=16.6.0 PYOPENSSL_VERSION=17.5.0
-  fast_finish: true
 
 before_install:
   - sudo apt-get update
@@ -63,7 +39,7 @@ before_install:
   - chmod -R og-w $PYTHON_EGG_CACHE
 
 install:
-  - TWISTED_VERSION=$TWISTED_VERSION PYOPENSSL_VERSION=$PYOPENSSL_VERSION 
./scripts/install-dependencies
+  - ./scripts/install-dependencies
   - make install
 
 # Start a BridgeDB instance before running the tests:
diff --git a/Makefile b/Makefile
index 428f004..08c2fbd 100644
--- a/Makefile
+++ b/Makefile
@@ -73,7 +73,7 @@ ifeq ($(PYTHON_IMPLEMENTATION),PyPy)
@echo "Detected PyPy... not running coverage."
python setup.py test
 else
-   coverage run --rcfile=".coveragerc" $(TRIAL) ./bridgedb/test/test_*.py
+   coverage run --rcfile=".coveragerc" -m twisted.trial 
./bridgedb/test/test_*.py
coverage report --rcfile=".coveragerc"
 endif
 
diff --git a/bridgedb/distributors/https/server.py 
b/bridgedb/distributors/https/server.py
index e5df7da..81bc353 100644
--- a/bridgedb/distributors/https/server.py
+++ b/bridgedb/distributors/https/server.py
@@ -69,7 +69,7 @@ from bridgedb.util import replaceControlChars
 
 #: The path to the HTTPS distributor's web templates.  (Should be the
 #: "templates" directory in the same directory as this file.)
-TEMPLATE_DIR = os.path.join(os.path.dirname(__file__), 'templates')
+TEMPLATE_DIR = os.path.join(os.path.abspath(os.path.dirname(__file__)), 
'templates')
 
 # Setting `filesystem_checks` to False is recommended for production servers,
 # due to potential speed increases. This means that the atimes of the Mako
diff --git a/bridgedb/test/test_crypto.py b/bridgedb/test/test_crypto.py
index 10974bb..7a34671 100644
--- a/bridgedb/test/test_crypto.py
+++ b/bridgedb/test/test_crypto.py
@@ -329,7 +329,7 @@ class SSLVerifyingContextFactoryTests(unittest.TestCase,
 
 def setUp(self):
 """Create a fake reactor for these tests."""
-self.reactor = self.Reactor()
+self.reactor = self.createReactor()
 self.url = 'https://www.example.com/someresource.html#andatag'
 
 def test_getHostnameFromURL(self):
diff --git a/bridgedb/translations.py b/bridgedb/translations.py
index f3e6ed4..7429b60 100644
--- a/bridgedb/translations.py
+++ b/bridgedb/translations.py
@@

[tor-commits] [bridgedb/master] Request new translations.

2019-10-03 Thread phw

commit a93a636072865c60fa9d1e36dee2d4a5c09355d5
Author: Philipp Winter 
Date:   Thu Oct 3 15:05:38 2019 -0700

Request new translations.

We modified a string in strings.py and should request new translations
for it.  The following command updated bridgedb.pot automatically:

  python setup.py extract_messages
---
 bridgedb/i18n/templates/bridgedb.pot | 312 ++-
 1 file changed, 161 insertions(+), 151 deletions(-)

diff --git a/bridgedb/i18n/templates/bridgedb.pot 
b/bridgedb/i18n/templates/bridgedb.pot
index bc6080f..1607e92 100644
--- a/bridgedb/i18n/templates/bridgedb.pot
+++ b/bridgedb/i18n/templates/bridgedb.pot
@@ -1,24 +1,42 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
-# 
-# Translators:
-# runasand , 2011
+# Translations template for bridgedb.
+# Copyright (C) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
+# FIRST AUTHOR , 2019.
+#
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Tor Project\n"
-"Report-Msgid-Bugs-To: 
'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB=bridgedb-reported,msgid=isis,sysrqb=isis'\n"
-"POT-Creation-Date: 2015-07-25 03:40+\n"
-"PO-Revision-Date: 2017-09-19 09:41+\n"
-"Last-Translator: runasand \n"
-"Language-Team: English 
(http://www.transifex.com/otf/torproject/language/en/)\n"
+"Project-Id-Version: bridgedb 0.8.0+15.gd9d886f.dirty\n"
+"Report-Msgid-Bugs-To: "
+"'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB;
+"=bridgedb-reported,msgid=isis,sysrqb=isis'\n"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME \n"
+"Language-Team: LANGUAGE \n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
-"Language: en\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
+"Generated-By: Babel 2.7.0\n"
+
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates.  (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : Localisations which BridgeDB supports which should be rendered 
right-to-left.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
 #. "BridgeDB"
@@ -30,177 +48,171 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
 msgid "Sorry! Something went wrong with your request."
-msgstr "Sorry! Something went wrong with your request."
+msgstr ""
 
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
 msgid "Report a Bug"
-msgstr "Report a Bug"
+msgstr ""
 
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
 msgid "Source Code"
-msgstr "Source Code"
+msgstr ""
 
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:85
 msgid "Changelog"
-msgstr "Changelog"
-
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Contact"
+msgstr ""
 
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
 msgid "Select All"
-msgstr "Select All"
+msgstr ""
 
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
 msgid "Show QRCode"
-msgstr "Show QRCode"
+msgstr ""
 
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"
-msgstr "QRCode for your bridge lines"
+msgstr ""
 
 #. TRANSLATORS: Please translate this into some silly way to say
 #. "There was a problem!" in your language. For example,
 #. for Italian, you might translate this

[tor-commits] [bridgedb/master] Require exactly pillow version 6.1.0.

2019-10-03 Thread phw

commit f78db9b955bdca354dd8db6a1f552d869c1f6cbc
Author: Philipp Winter 
Date:   Thu Sep 12 16:38:26 2019 -0700

Require exactly pillow version 6.1.0.

This makes the pillow requirement consistent with all other
requirements, which are pinned to a specific version.
---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 05d5444..d5a3c9f 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,7 +5,7 @@ PyCryptodome==3.9.0
 Twisted==19.7.0
 gnupg==2.3.1
 ipaddr==2.2.0
-pillow>=6.1.0
+pillow==6.1.0
 pyOpenSSL==19.0.0
 pygeoip==0.3.2
 qrcode==6.1



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

[tor-commits] [bridgedb/master] Bump version number to 0.8.3.

2019-10-03 Thread phw

commit ad8a95f55879d41cf69456ba1942c9129e315dc4
Author: Philipp Winter 
Date:   Thu Oct 3 15:54:16 2019 -0700

Bump version number to 0.8.3.
---
 CHANGELOG | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 4773a06..be4c6d2 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,4 @@
-Changes in version A.B.C - -MM-DD
+Changes in version 0.8.3 - 2019-10-03
 
 * FIXES https://bugs.torproject.org/31903
 Update existing translations and request new translations.  Thanks to



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

[tor-commits] [bridgedb/master] Add CHANGELOG entry.

2019-10-03 Thread phw

commit edf27d16c44401c2187505f8448915a0353fe334
Author: Philipp Winter 
Date:   Thu Sep 12 15:55:45 2019 -0700

Add CHANGELOG entry.
---
 CHANGELOG | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index c2fca89..48e18eb 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -6,6 +6,12 @@ Changes in version A.B.C - -MM-DD
 also makes our implementation consistent with our (slightly updated)
 specification.
 
+* FIXES https://bugs.torproject.org/29484
+Update BridgeDB's requirements to the latest respective versions.  
Among
+others, this patch set updates Twisted to 19.7.0, pyOpenSSL to 19.0.0,
+and replaces (the abandoned) PyCrypto with PyCryptodome, which fixes
+security vulnerabilities.
+
 Changes in version 0.8.2 - 2019-09-20
 
 Updated translations for the following languages:



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

[tor-commits] [bridgedb/master] Update pyOpenSSL to version 17.5.0.

2019-10-03 Thread phw

commit 935c3eaa7ad0287d15b276b1098fd4eeed29dd56
Author: Philipp Winter 
Date:   Mon Sep 9 18:28:18 2019 -0700

Update pyOpenSSL to version 17.5.0.

This fixes security vulnerabilities.
---
 .travis.yml  | 18 +-
 requirements.txt |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 26e4d28..9d30d10 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -34,27 +34,27 @@ env:
 - PYTHON_EGG_CACHE="${HOME}/.python-eggs-$(echo $RANDOM$PPID$RANDOM | 
sha256sum | cut -d ' ' -f 1)"
   matrix:
 # What we're running on polyanthum
-- TWISTED_VERSION=16.1.1 PYOPENSSL_VERSION=16.2.0
+- TWISTED_VERSION=16.1.1 PYOPENSSL_VERSION=17.5.0
 # Debian Stretch
-- TWISTED_VERSION=16.6.0 PYOPENSSL_VERSION=16.2.0
+- TWISTED_VERSION=16.6.0 PYOPENSSL_VERSION=17.5.0
 # Debian experimental (all other versions of Debian have the same 
dependency versions right now)
-- TWISTED_VERSION=17.1.0 PYOPENSSL_VERSION=16.2.0
+- TWISTED_VERSION=17.1.0 PYOPENSSL_VERSION=17.5.0
 
 matrix:
   include:
 - python: "pypy"
-  env: TWISTED_VERSION=16.1.1 PYOPENSSL_VERSION=16.2.0
+  env: TWISTED_VERSION=16.1.1 PYOPENSSL_VERSION=17.5.0
 - python: "pypy"
-  env: TWISTED_VERSION=16.6.0 PYOPENSSL_VERSION=16.2.0
+  env: TWISTED_VERSION=16.6.0 PYOPENSSL_VERSION=17.5.0
   allow_failures:
 - python: "2.7"
-  env: TWISTED_VERSION=16.6.0 PYOPENSSL_VERSION=16.2.0
+  env: TWISTED_VERSION=16.6.0 PYOPENSSL_VERSION=17.5.0
 - python: "2.7"
-  env: TWISTED_VERSION=17.1.0 PYOPENSSL_VERSION=16.2.0
+  env: TWISTED_VERSION=17.1.0 PYOPENSSL_VERSION=17.5.0
 - python: "pypy"
-  env: TWISTED_VERSION=16.1.1 PYOPENSSL_VERSION=16.2.0
+  env: TWISTED_VERSION=16.1.1 PYOPENSSL_VERSION=17.5.0
 - python: "pypy"
-  env: TWISTED_VERSION=16.6.0 PYOPENSSL_VERSION=16.2.0
+  env: TWISTED_VERSION=16.6.0 PYOPENSSL_VERSION=17.5.0
   fast_finish: true
 
 before_install:
diff --git a/requirements.txt b/requirements.txt
index b64aec3..0ceccca 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -3,7 +3,7 @@ BeautifulSoup==3.2.1
 Mako==0.8.1
 Twisted==16.1.1
 ipaddr==2.1.11
-pyOpenSSL==16.2.0
+pyOpenSSL==17.5.0
 pygeoip==0.2.7
 PyCryptodome==3.8.2
 gnupg==2.0.1



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

[tor-commits] [bridgedb/master] Replace PyCrypto with PyCryptodome.

2019-10-03 Thread phw

commit 75471cdab181759d4e659c3d16265e437151428a
Author: Philipp Winter 
Date:   Mon Sep 9 18:15:18 2019 -0700

Replace PyCrypto with PyCryptodome.

PyCrypto has unfixed security vulnerabilities and is no longer
maintained.  PyCryptodome is a (mostly) drop-in replacement, which does
not have these vulnerabilities.  Let's use PyCryptodome instead.
---
 .travis.requirements.txt | 2 +-
 requirements.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.requirements.txt b/.travis.requirements.txt
index e6eaf10..5c1e433 100644
--- a/.travis.requirements.txt
+++ b/.travis.requirements.txt
@@ -21,8 +21,8 @@ Babel==0.9.6
 BeautifulSoup==3.2.1
 Mako==0.8.1
 ipaddr==2.1.11
-pycrypto==2.6.1
 pygeoip==0.2.7
+PyCryptodome==3.8.2
 gnupg==2.0.1
 pillow>=2.6.1
 qrcode==5.0.1
diff --git a/requirements.txt b/requirements.txt
index d7713df..b64aec3 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -3,9 +3,9 @@ BeautifulSoup==3.2.1
 Mako==0.8.1
 Twisted==16.1.1
 ipaddr==2.1.11
-pycrypto==2.6.1
 pyOpenSSL==16.2.0
 pygeoip==0.2.7
+PyCryptodome==3.8.2
 gnupg==2.0.1
 pillow>=2.6.1
 qrcode==5.0.1



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

[tor-commits] [bridgedb/master] Import rfc822 directly instead of over detour.

2019-10-03 Thread phw

commit 15b8e0df097e2cf98c13faf6aabc3236520fa14b
Author: Philipp Winter 
Date:   Thu Sep 12 08:59:50 2019 -0700

Import rfc822 directly instead of over detour.

Some of our code got the rfc822 module over a detour, by importing it
through twisted.mail.smtp.  This is dangerous and only works if
twisted.mail.smtp actually does import rfc822 -- which newer versions
stopped doing.  We're fixing this by doing what we should have been
doing all along: importing the module ourselves.
---
 bridgedb/distributors/email/server.py | 3 ++-
 bridgedb/test/test_email_dkim.py  | 2 +-
 bridgedb/test/test_email_server.py| 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/bridgedb/distributors/email/server.py 
b/bridgedb/distributors/email/server.py
index 229f118..8bd4b36 100644
--- a/bridgedb/distributors/email/server.py
+++ b/bridgedb/distributors/email/server.py
@@ -52,6 +52,7 @@ from __future__ import unicode_literals
 import logging
 import io
 import socket
+import rfc822
 
 from twisted.internet import defer
 from twisted.internet import reactor
@@ -254,7 +255,7 @@ class SMTPMessage(object):
 for line in self.lines:
 rawMessage.writelines(unicode(line.decode('utf8')) + u'\n')
 rawMessage.seek(0)
-return smtp.rfc822.Message(rawMessage)
+return rfc822.Message(rawMessage)
 
 
 class SMTPIncomingDelivery(smtp.SMTP):
diff --git a/bridgedb/test/test_email_dkim.py b/bridgedb/test/test_email_dkim.py
index dc4c53b..be34370 100644
--- a/bridgedb/test/test_email_dkim.py
+++ b/bridgedb/test/test_email_dkim.py
@@ -12,8 +12,8 @@
 """Unittests for the :mod:`bridgedb.distributors.email.dkim` module."""
 
 import io
+import rfc822
 
-from twisted.mail.smtp import rfc822
 from twisted.trial import unittest
 
 from bridgedb.distributors.email import dkim
diff --git a/bridgedb/test/test_email_server.py 
b/bridgedb/test/test_email_server.py
index edf2539..bc331f4 100644
--- a/bridgedb/test/test_email_server.py
+++ b/bridgedb/test/test_email_server.py
@@ -16,6 +16,7 @@ from __future__ import print_function
 import socket
 import string
 import types
+import rfc822
 
 from twisted.python import log
 from twisted.internet import defer
@@ -25,7 +26,6 @@ from twisted.mail.smtp import SMTPBadRcpt
 from twisted.mail.smtp import SMTPBadSender
 from twisted.mail.smtp import User
 from twisted.mail.smtp import Address
-from twisted.mail.smtp import rfc822
 from twisted.test import proto_helpers
 from twisted.trial import unittest
 



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

[tor-commits] [bridgedb/master] Merge branch 'task/31903' into develop

2019-10-03 Thread phw

commit 44d6ed319f8c6f8c43ea0db2eb8c0e64c3d73b50
Merge: 0751ad7 a93a636
Author: Philipp Winter 
Date:   Thu Oct 3 15:16:37 2019 -0700

Merge branch 'task/31903' into develop

 bridgedb/i18n/fr/LC_MESSAGES/bridgedb.po |   9 +-
 bridgedb/i18n/nl/LC_MESSAGES/bridgedb.po |   2 +-
 bridgedb/i18n/templates/bridgedb.pot | 312 ---
 3 files changed, 167 insertions(+), 156 deletions(-)



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

[tor-commits] [bridgedb/master] Merge branch 'task/31780' into develop

2019-10-03 Thread phw

commit 0751ad7148447f30df7c015c77853d58b6077f71
Merge: e5f83a4 39b6285
Author: Philipp Winter 
Date:   Thu Oct 3 14:28:02 2019 -0700

Merge branch 'task/31780' into develop

 CHANGELOG |  8 +
 bridgedb/main.py  |  2 +-
 bridgedb/metrics.py   | 13 
 bridgedb/test/test_metrics.py |  4 +--
 doc/bridgedb-metrics-spec.txt | 74 +++
 5 files changed, 91 insertions(+), 10 deletions(-)



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

[tor-commits] [bridgedb/master] Update French translation.

2019-10-03 Thread phw

commit 41e38fca404d70e9c0f8f1ed7895524dc7504ac4
Author: Philipp Winter 
Date:   Mon Sep 30 16:20:06 2019 -0700

Update French translation.
---
 bridgedb/i18n/fr/LC_MESSAGES/bridgedb.po | 9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/bridgedb/i18n/fr/LC_MESSAGES/bridgedb.po 
b/bridgedb/i18n/fr/LC_MESSAGES/bridgedb.po
index 32c57a7..12d091d 100644
--- a/bridgedb/i18n/fr/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/fr/LC_MESSAGES/bridgedb.po
@@ -3,6 +3,7 @@
 # This file is distributed under the same license as the BridgeDB project.
 # 
 # Translators:
+# Translators:
 # AO , 2018-2019
 # apaddlingduck, 2014
 # Boubou , 2015
@@ -30,7 +31,7 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 
'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB=bridgedb-reported,msgid=isis,sysrqb=isis'\n"
 "POT-Creation-Date: 2015-07-25 03:40+\n"
-"PO-Revision-Date: 2019-05-17 16:23+\n"
+"PO-Revision-Date: 2019-09-23 19:14+\n"
 "Last-Translator: AO \n"
 "Language-Team: French 
(http://www.transifex.com/otf/torproject/language/fr/)\n"
 "MIME-Version: 1.0\n"
@@ -121,7 +122,7 @@ msgstr "Ãtape %s1%s"
 #: bridgedb/https/templates/index.html:13
 #, python-format
 msgid "Download %s Tor Browser %s"
-msgstr "TÃ©lÃ©charger %s le NavigateurÂ Tor %s"
+msgstr "TÃ©lÃ©chargez %s le NavigateurÂ Tor %s"
 
 #: bridgedb/https/templates/index.html:25
 #, python-format
@@ -131,7 +132,7 @@ msgstr "Ãtape %s2%s"
 #: bridgedb/https/templates/index.html:27
 #, python-format
 msgid "Get %s bridges %s"
-msgstr "Obtenir des %s ponts %s"
+msgstr "Obtenez des %s ponts %s"
 
 #: bridgedb/https/templates/index.html:36
 #, python-format
@@ -141,7 +142,7 @@ msgstr "Ãtape %s3%s"
 #: bridgedb/https/templates/index.html:38
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
-msgstr "Maintenant, %s ajouter les ponts au navigateur Le NavigateurÂ Tor %s"
+msgstr "Maintenant, %s ajoutez les ponts au NavigateurÂ Tor %s"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!



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

[tor-commits] [bridgedb/master] Use last-available translation to fix unit test.

2019-10-03 Thread phw

commit d9d886f15aad518713a08650002e32abe9cdf73e
Author: Philipp Winter 
Date:   Tue Oct 1 12:04:19 2019 -0700

Use last-available translation to fix unit test.

When we last updated our translations, in commit 968a5db, the Dutch
translation for "What are bridges?" disappared, which broke a unit
test.  This commit re-adds this particular translation -- it does seem
correct, after all.
---
 bridgedb/i18n/nl/LC_MESSAGES/bridgedb.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bridgedb/i18n/nl/LC_MESSAGES/bridgedb.po 
b/bridgedb/i18n/nl/LC_MESSAGES/bridgedb.po
index 1348231..62ada3b 100644
--- a/bridgedb/i18n/nl/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/nl/LC_MESSAGES/bridgedb.po
@@ -268,7 +268,7 @@ msgstr ""
 
 #: bridgedb/strings.py:101
 msgid "What are bridges?"
-msgstr ""
+msgstr "Wat zijn bridges?"
 
 #: bridgedb/strings.py:102
 #, python-format



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

[tor-commits] [bridgedb/master] Merge branch 'release-0.8.2' into develop

2019-10-03 Thread phw

commit e5f83a44f7d9c3da2d2f4821707a8f2ab60115d4
Merge: 069714d 76526a4
Author: Philipp Winter 
Date:   Mon Sep 30 16:13:33 2019 -0700

Merge branch 'release-0.8.2' into develop

 CHANGELOG | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)



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

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

2019-10-03 Thread translation

commit 7ec5f20ca09a8def254fd97ddfb0d0a446418519
Author: Translation commit bot 
Date:   Thu Oct 3 22:51:23 2019 +


https://gitweb.torproject.org/translation.git/commit/?h=torbutton-abouttbupdatedtd
---
 mk/abouttbupdate.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mk/abouttbupdate.dtd b/mk/abouttbupdate.dtd
index eb6275108..9d8c386a7 100644
--- a/mk/abouttbupdate.dtd
+++ b/mk/abouttbupdate.dtd
@@ -1,7 +1,7 @@
 
 
 
-
+
 
 
 

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

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

2019-10-03 Thread translation

commit 15e1d8329abb507d8d09a8930c8c70cc18d02de0
Author: Translation commit bot 
Date:   Thu Oct 3 22:51:29 2019 +


https://gitweb.torproject.org/translation.git/commit/?h=torbutton-abouttbupdatedtd_completed
---
 mk/abouttbupdate.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mk/abouttbupdate.dtd b/mk/abouttbupdate.dtd
index eb6275108..9d8c386a7 100644
--- a/mk/abouttbupdate.dtd
+++ b/mk/abouttbupdate.dtd
@@ -1,7 +1,7 @@
 
 
 
-
+
 
 
 

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

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

2019-10-03 Thread translation

commit 5d6663a4080c5bb146845bc8c8b3e97ad440de24
Author: Translation commit bot 
Date:   Thu Oct 3 22:52:09 2019 +


https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-properties
---
 mk/torlauncher.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mk/torlauncher.properties b/mk/torlauncher.properties
index b370ad7d0..ec567c582 100644
--- a/mk/torlauncher.properties
+++ b/mk/torlauncher.properties
@@ -52,7 +52,7 @@ torlauncher.forAssistance2=ÐÐ° Ð¿Ð¾Ð¼Ð¾Ñ, Ð¿Ð¾ÑÐµÑÐµÑÐµ 
ÑÐ° %S
 
 torlauncher.copiedNLogMessages=ÐÐ¾Ð¿Ð¸ÑÐ°ÑÐµÑÐ¾ Ðµ Ð·Ð°Ð²ÑÑÐµÐ½Ð¾. %S 
Tor Ð»Ð¾Ð³ Ð¿Ð¾ÑÐ°ÐºÐ¸ÑÐµ ÑÐµ Ð¿Ð¾Ð´Ð³Ð¾ÑÐ²ÐµÐ½Ð¸ Ð´Ð° Ð±Ð¸Ð´Ð°Ñ 
Ð·Ð°Ð»ÐµÐ¿ÐµÐ½Ð¸ Ð²Ð¾ ÑÑÐµÐ´ÑÐ²Ð°Ñ Ð½Ð° ÑÐµÐºÑÑ Ð¸Ð»Ð¸ Ð²Ð¾ Ð¿Ð¾ÑÐ°ÐºÐ° 
Ð·Ð° Ðµ-Ð¿Ð¾ÑÑÐ°.
 
-torlauncher.bootstrapStatus.starting=ÐÐ°Ð¿Ð¾ÑÐ½ÑÐ²Ð°ÑÐµ
+torlauncher.bootstrapStatus.starting=ÐÐ°Ð¿Ð¾ÑÐ½ÑÐ²Ð°ÑÐµÑÐ¾
 torlauncher.bootstrapStatus.conn_pt=ÐÐ¾Ð²ÑÐ·ÑÐ²Ð°ÑÐµ ÑÐ¾ Ð¼Ð¾ÑÑ
 torlauncher.bootstrapStatus.conn_done_pt=ÐÐ¾Ð²ÑÐ·Ð°Ð½ ÑÐ¾ Ð¼Ð¾ÑÑ
 torlauncher.bootstrapStatus.conn_proxy=ÐÐ¾Ð²ÑÐ·ÑÐ²Ð°ÑÐµ ÑÐ¾ Ð¿ÑÐ¾ÐºÑÐ¸

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

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

2019-10-03 Thread translation

commit 505b751f1db9600b0dfc63d89ca22ca9dedf6bfc
Author: Translation commit bot 
Date:   Thu Oct 3 22:52:15 2019 +


https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-properties_completed
---
 mk/torlauncher.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mk/torlauncher.properties b/mk/torlauncher.properties
index b370ad7d0..ec567c582 100644
--- a/mk/torlauncher.properties
+++ b/mk/torlauncher.properties
@@ -52,7 +52,7 @@ torlauncher.forAssistance2=ÐÐ° Ð¿Ð¾Ð¼Ð¾Ñ, Ð¿Ð¾ÑÐµÑÐµÑÐµ 
ÑÐ° %S
 
 torlauncher.copiedNLogMessages=ÐÐ¾Ð¿Ð¸ÑÐ°ÑÐµÑÐ¾ Ðµ Ð·Ð°Ð²ÑÑÐµÐ½Ð¾. %S 
Tor Ð»Ð¾Ð³ Ð¿Ð¾ÑÐ°ÐºÐ¸ÑÐµ ÑÐµ Ð¿Ð¾Ð´Ð³Ð¾ÑÐ²ÐµÐ½Ð¸ Ð´Ð° Ð±Ð¸Ð´Ð°Ñ 
Ð·Ð°Ð»ÐµÐ¿ÐµÐ½Ð¸ Ð²Ð¾ ÑÑÐµÐ´ÑÐ²Ð°Ñ Ð½Ð° ÑÐµÐºÑÑ Ð¸Ð»Ð¸ Ð²Ð¾ Ð¿Ð¾ÑÐ°ÐºÐ° 
Ð·Ð° Ðµ-Ð¿Ð¾ÑÑÐ°.
 
-torlauncher.bootstrapStatus.starting=ÐÐ°Ð¿Ð¾ÑÐ½ÑÐ²Ð°ÑÐµ
+torlauncher.bootstrapStatus.starting=ÐÐ°Ð¿Ð¾ÑÐ½ÑÐ²Ð°ÑÐµÑÐ¾
 torlauncher.bootstrapStatus.conn_pt=ÐÐ¾Ð²ÑÐ·ÑÐ²Ð°ÑÐµ ÑÐ¾ Ð¼Ð¾ÑÑ
 torlauncher.bootstrapStatus.conn_done_pt=ÐÐ¾Ð²ÑÐ·Ð°Ð½ ÑÐ¾ Ð¼Ð¾ÑÑ
 torlauncher.bootstrapStatus.conn_proxy=ÐÐ¾Ð²ÑÐ·ÑÐ²Ð°ÑÐµ ÑÐ¾ Ð¿ÑÐ¾ÐºÑÐ¸

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

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

2019-10-03 Thread translation

commit 935bef64bed096e5e611f7bb29e5b788d2faced6
Author: Translation commit bot 
Date:   Thu Oct 3 22:50:46 2019 +


https://gitweb.torproject.org/translation.git/commit/?h=torbutton-branddtd_completed
---
 mk/brand.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mk/brand.dtd b/mk/brand.dtd
index 63d055ae9..30e201ebf 100644
--- a/mk/brand.dtd
+++ b/mk/brand.dtd
@@ -6,7 +6,7 @@
 
 
 
-
+
 
 
 

___
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 'fix/29484' into develop

2019-10-03 Thread phw

commit 53bcb77571c7a1f6c60bef44fefb1ef39cd65c7f
Merge: 44d6ed3 edf27d1
Author: Philipp Winter 
Date:   Thu Oct 3 15:34:57 2019 -0700

Merge branch 'fix/29484' into develop

 .test.requirements.txt| 12 +---
 .travis.requirements.txt  | 31 ---
 .travis.yml   | 28 ++--
 CHANGELOG |  6 ++
 Makefile  |  2 +-
 bridgedb/distributors/email/server.py |  3 ++-
 bridgedb/distributors/https/server.py |  2 +-
 bridgedb/test/test_crypto.py  |  2 +-
 bridgedb/test/test_email_dkim.py  |  2 +-
 bridgedb/test/test_email_server.py|  2 +-
 bridgedb/test/test_persistent.py  |  8 
 bridgedb/translations.py  |  2 +-
 doc/HACKING.md| 17 +
 requirements.txt  | 26 +-
 scripts/install-dependencies  |  5 ++---
 15 files changed, 73 insertions(+), 75 deletions(-)

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

[tor-commits] [bridgedb/develop] Use canonical package names.

2019-10-03 Thread phw

commit 14dfd92ec825b1689da4b5c3438463249a37b9a0
Author: Philipp Winter 
Date:   Tue Oct 1 10:10:58 2019 -0700

Use canonical package names.

Let's capitalise packages correctly.
---
 .travis.requirements.txt | 4 ++--
 requirements.txt | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.travis.requirements.txt b/.travis.requirements.txt
index 4d451da..3e768d2 100644
--- a/.travis.requirements.txt
+++ b/.travis.requirements.txt
@@ -16,14 +16,14 @@
 Babel==2.7.0
 BeautifulSoup==3.2.1
 Mako==1.1.0
-PyCryptodome==3.9.0
+pycryptodome==3.9.0
 Twisted==19.7.0
 coverage==4.5.4
 coveralls==1.8.2
 gnupg==2.3.1
 ipaddr==2.2.0
 mechanize==0.4.3
-pillow==6.1.0
+Pillow==6.1.0
 pygeoip==0.3.2
 qrcode==6.1
 service_identity==18.1.0
diff --git a/requirements.txt b/requirements.txt
index d5a3c9f..6944d1a 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,11 +1,11 @@
 Babel==2.7.0
 BeautifulSoup==3.2.1
 Mako==1.1.0
-PyCryptodome==3.9.0
+pycryptodome==3.9.0
 Twisted==19.7.0
 gnupg==2.3.1
 ipaddr==2.2.0
-pillow==6.1.0
+Pillow==6.1.0
 pyOpenSSL==19.0.0
 pygeoip==0.3.2
 qrcode==6.1



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

[tor-commits] [bridgedb/develop] Update to pylint version 2.4.2.

2019-10-03 Thread phw

commit 2d3ef0a8ce5a01ff641aed43efd90d49405a42fd
Author: Philipp Winter 
Date:   Thu Sep 12 15:56:19 2019 -0700

Update to pylint version 2.4.2.

The bug that was once the reason to stick with version 1.1.0 has seen
been resolved: 
---
 .test.requirements.txt | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.test.requirements.txt b/.test.requirements.txt
index 2b6da2f..298d61a 100644
--- a/.test.requirements.txt
+++ b/.test.requirements.txt
@@ -8,7 +8,5 @@
 coverage==4.5.4
 mechanize==0.4.3
 pep8==1.7.1
-# pylint must be pinned until pylint bug #203 is fixed. See
-# 
https://bitbucket.org/logilab/pylint/issue/203/importing-namespace-packages-crashes#comment-11013783
-pylint==1.1.0
+pylint==2.4.2
 sure==1.4.11



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

[tor-commits] [bridgedb/develop] Update libraries to their latest versions.

2019-10-03 Thread phw

commit bd847b3409cf0fa2fd9854d92383e43994739893
Author: Philipp Winter 
Date:   Thu Sep 12 14:38:50 2019 -0700

Update libraries to their latest versions.

This patch updates all of our less problematic libraries to their latest
respective versions.  We can determine a library's latest version by
running:

  yolk -V LIBRARY

You can run 'pip install yolk' if you don't have the tool installed
already.
---
 .test.requirements.txt   |  8 
 .travis.requirements.txt | 28 ++--
 requirements.txt | 24 
 3 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/.test.requirements.txt b/.test.requirements.txt
index ad5342f..2b6da2f 100644
--- a/.test.requirements.txt
+++ b/.test.requirements.txt
@@ -5,10 +5,10 @@
 # $ pip install -r .test.requirements.txt
 # $ make coverage
 #
-coverage==4.2
-mechanize==0.2.5
-pep8==1.5.7
+coverage==4.5.4
+mechanize==0.4.3
+pep8==1.7.1
 # pylint must be pinned until pylint bug #203 is fixed. See
 # 
https://bitbucket.org/logilab/pylint/issue/203/importing-namespace-packages-crashes#comment-11013783
 pylint==1.1.0
-sure==1.2.2
+sure==1.4.11
diff --git a/.travis.requirements.txt b/.travis.requirements.txt
index 5c1e433..9d69ab7 100644
--- a/.travis.requirements.txt
+++ b/.travis.requirements.txt
@@ -13,19 +13,19 @@
 # $ make coverage
 #
 #--
-coverage==4.2
-coveralls==1.2.0
-mechanize==0.2.5
-sure==1.2.2
-Babel==0.9.6
+coverage==4.5.4
+coveralls==1.8.2
+mechanize==0.4.3
+sure==1.4.11
+Babel==2.7.0
 BeautifulSoup==3.2.1
-Mako==0.8.1
-ipaddr==2.1.11
-pygeoip==0.2.7
-PyCryptodome==3.8.2
-gnupg==2.0.1
-pillow>=2.6.1
-qrcode==5.0.1
-service_identity==14.0.0
+Mako==1.1.0
+ipaddr==2.2.0
+pygeoip==0.3.2
+PyCryptodome==3.9.0
+gnupg==2.3.1
+pillow==6.1.0
+qrcode==6.1
+service_identity==18.1.0
 
git+https://git.torproject.org/stem.git@3eb59411781c4fa210979cb112b800c001a59f6c#egg=stem-1.5.4.dev1-py2.7
-zope.interface==3.6.1
+zope.interface==4.6.0
diff --git a/requirements.txt b/requirements.txt
index 0ceccca..1b25a90 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,14 +1,14 @@
-Babel==2.5.1
+Babel==2.7.0
 BeautifulSoup==3.2.1
-Mako==0.8.1
-Twisted==16.1.1
-ipaddr==2.1.11
-pyOpenSSL==17.5.0
-pygeoip==0.2.7
-PyCryptodome==3.8.2
-gnupg==2.0.1
-pillow>=2.6.1
-qrcode==5.0.1
-service_identity==14.0.0
+Mako==1.1.0
+Twisted==16.6.0
+ipaddr==2.2.0
+pyOpenSSL==19.0.0
+pygeoip==0.3.2
+PyCryptodome==3.9.0
+gnupg==2.3.1
+pillow>=6.1.0
+qrcode==6.1
+service_identity==18.1.0
 
git+https://git.torproject.org/stem.git@3eb59411781c4fa210979cb112b800c001a59f6c#egg=stem-1.5.4.dev1-py2.7
-zope.interface==3.6.1
+zope.interface==4.6.0



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

[tor-commits] [bridgedb/develop] Update Twisted to 19.7.0.

2019-10-03 Thread phw

commit 4ee54ce81a5ef7466067f3637258e4aa6de541bc
Author: Philipp Winter 
Date:   Thu Sep 12 16:27:11 2019 -0700

Update Twisted to 19.7.0.

In the process, we can also get rid of our build matrix because
there's no longer a need to test different Twisted (or pyOpenSSL)
versions.

We had to fix a number of issues to support the latest Twisted version:

* Change Reactor() to createReactor() in a unit test.

* Invoke unit tests with "-m twisted.trial" instead of "$(TRIAL)" to
  unbreak our code coverage reporting.

* Use absolute paths for our translations because otherwise our new
  unit test invocation with "-m twisted.trial" would look in the wrong
  place and fail.
---
 .travis.requirements.txt  |  1 +
 .travis.yml   | 26 +-
 Makefile  |  2 +-
 bridgedb/distributors/https/server.py |  2 +-
 bridgedb/test/test_crypto.py  |  2 +-
 bridgedb/translations.py  |  2 +-
 requirements.txt  |  2 +-
 scripts/install-dependencies  |  5 ++---
 8 files changed, 9 insertions(+), 33 deletions(-)

diff --git a/.travis.requirements.txt b/.travis.requirements.txt
index 9d69ab7..2f8d861 100644
--- a/.travis.requirements.txt
+++ b/.travis.requirements.txt
@@ -23,6 +23,7 @@ Mako==1.1.0
 ipaddr==2.2.0
 pygeoip==0.3.2
 PyCryptodome==3.9.0
+Twisted==19.7.0
 gnupg==2.3.1
 pillow==6.1.0
 qrcode==6.1
diff --git a/.travis.yml b/.travis.yml
index 9ec71fc..c0499b0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -32,30 +32,6 @@ env:
 # 
https://stackoverflow.com/questions/2192323/what-is-the-python-egg-cache-python-egg-cache
 # https://github.com/pypa/virtualenv/issues/459
 - PYTHON_EGG_CACHE="${HOME}/.python-eggs-$(echo $RANDOM$PPID$RANDOM | 
sha256sum | cut -d ' ' -f 1)"
-  matrix:
-# What we're running on polyanthum
-- TWISTED_VERSION=16.1.1 PYOPENSSL_VERSION=17.5.0
-# Debian Stretch
-- TWISTED_VERSION=16.6.0 PYOPENSSL_VERSION=17.5.0
-# Debian experimental (all other versions of Debian have the same 
dependency versions right now)
-- TWISTED_VERSION=17.1.0 PYOPENSSL_VERSION=17.5.0
-
-matrix:
-  include:
-- python: "pypy"
-  env: TWISTED_VERSION=16.1.1 PYOPENSSL_VERSION=17.5.0
-- python: "pypy"
-  env: TWISTED_VERSION=16.6.0 PYOPENSSL_VERSION=17.5.0
-  allow_failures:
-- python: "2.7"
-  env: TWISTED_VERSION=16.6.0 PYOPENSSL_VERSION=17.5.0
-- python: "2.7"
-  env: TWISTED_VERSION=17.1.0 PYOPENSSL_VERSION=17.5.0
-- python: "pypy"
-  env: TWISTED_VERSION=16.1.1 PYOPENSSL_VERSION=17.5.0
-- python: "pypy"
-  env: TWISTED_VERSION=16.6.0 PYOPENSSL_VERSION=17.5.0
-  fast_finish: true
 
 before_install:
   - sudo apt-get update
@@ -63,7 +39,7 @@ before_install:
   - chmod -R og-w $PYTHON_EGG_CACHE
 
 install:
-  - TWISTED_VERSION=$TWISTED_VERSION PYOPENSSL_VERSION=$PYOPENSSL_VERSION 
./scripts/install-dependencies
+  - ./scripts/install-dependencies
   - make install
 
 # Start a BridgeDB instance before running the tests:
diff --git a/Makefile b/Makefile
index 428f004..08c2fbd 100644
--- a/Makefile
+++ b/Makefile
@@ -73,7 +73,7 @@ ifeq ($(PYTHON_IMPLEMENTATION),PyPy)
@echo "Detected PyPy... not running coverage."
python setup.py test
 else
-   coverage run --rcfile=".coveragerc" $(TRIAL) ./bridgedb/test/test_*.py
+   coverage run --rcfile=".coveragerc" -m twisted.trial 
./bridgedb/test/test_*.py
coverage report --rcfile=".coveragerc"
 endif
 
diff --git a/bridgedb/distributors/https/server.py 
b/bridgedb/distributors/https/server.py
index e5df7da..81bc353 100644
--- a/bridgedb/distributors/https/server.py
+++ b/bridgedb/distributors/https/server.py
@@ -69,7 +69,7 @@ from bridgedb.util import replaceControlChars
 
 #: The path to the HTTPS distributor's web templates.  (Should be the
 #: "templates" directory in the same directory as this file.)
-TEMPLATE_DIR = os.path.join(os.path.dirname(__file__), 'templates')
+TEMPLATE_DIR = os.path.join(os.path.abspath(os.path.dirname(__file__)), 
'templates')
 
 # Setting `filesystem_checks` to False is recommended for production servers,
 # due to potential speed increases. This means that the atimes of the Mako
diff --git a/bridgedb/test/test_crypto.py b/bridgedb/test/test_crypto.py
index 10974bb..7a34671 100644
--- a/bridgedb/test/test_crypto.py
+++ b/bridgedb/test/test_crypto.py
@@ -329,7 +329,7 @@ class SSLVerifyingContextFactoryTests(unittest.TestCase,
 
 def setUp(self):
 """Create a fake reactor for these tests."""
-self.reactor = self.Reactor()
+self.reactor = self.createReactor()
 self.url = 'https://www.example.com/someresource.html#andatag'
 
 def test_getHostnameFromURL(self):
diff --git a/bridgedb/translations.py b/bridgedb/translations.py
index f3e6ed4..7429b60 100644
--- a/bridgedb/translations.py
+++ b/bridgedb/translations.py
@@

[tor-commits] [bridgedb/develop] Add instructions on how to update dependencies.

2019-10-03 Thread phw

commit 73053db105605f74af02f9475ef30377b74be89d
Author: Philipp Winter 
Date:   Wed Oct 2 09:48:14 2019 -0700

Add instructions on how to update dependencies.
---
 doc/HACKING.md | 17 +
 1 file changed, 17 insertions(+)

diff --git a/doc/HACKING.md b/doc/HACKING.md
index a8ec640..5993696 100644
--- a/doc/HACKING.md
+++ b/doc/HACKING.md
@@ -34,6 +34,22 @@ we make are:
 
 ## Making a release
 
+### Updating dependencies
+
+We maintain three requirements.txt files:
+
+* requirements.txt (for BridgeDB)
+* .travis.requirements.txt (for Travis CI)
+* .test.requirements.txt (for unit tests)
+
+Each of these files contains pinned dependencies, which are guaranteed to work
+for a given release.  Before releasing a new version of BridgeDB, we should
+update our dependencies.  The tool [pur][pur] (available through pip) helps us
+with this.  It checks a given requirements.txt file and updates each dependency
+to its latest version:
+
+pur -r REQUIREMENTS_FILE
+
 ### Bumping the version number
 
 Bumping the version number at release time (which, for BridgeDB really means
@@ -67,3 +83,4 @@ References
 --
 [trac]: 
https://trac.torproject.org/projects/tor/query?status=!closed=Circumvention%2FBridgeDB
 [workflow]: https://nvie.com/posts/a-successful-git-branching-model/
+[pur]: https://pypi.org/project/pur/



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

[tor-commits] [bridgedb/develop] Adapt to sure's new API.

2019-10-03 Thread phw

commit 5d3a30aceaaf40507cfd63239183edbf27772abb
Author: Philipp Winter 
Date:   Thu Sep 12 14:59:45 2019 -0700

Adapt to sure's new API.
---
 bridgedb/test/test_persistent.py | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/bridgedb/test/test_persistent.py b/bridgedb/test/test_persistent.py
index 95abf61..858ad1a 100644
--- a/bridgedb/test/test_persistent.py
+++ b/bridgedb/test/test_persistent.py
@@ -89,7 +89,7 @@ class StateTest(unittest.TestCase):
 this(self.state).should.have.property('statefile')
 
 def test_persistent_getState(self):
-persistent.should.have.property('_getState').being(callable)
+persistent._getState.should.be.callable
 this(persistent._getState()).should.be.a(persistent.State)
 
 def test_getStateFor(self):
@@ -102,10 +102,10 @@ class StateTest(unittest.TestCase):
 the(self.state.statefile).should.be.a(str)
 
 def test_existsSave(self):
-this(self.state).should.have.property('save').being(callable)
+self.state.save.should.be.callable
 
 def test_existsLoad(self):
-persistent.should.have.property('load').being(callable)
+persistent.load.should.be.callable
 
 def test_persistent_state(self):
 the(persistent._state).should.be.a(persistent.State)
@@ -152,7 +152,7 @@ class StateTest(unittest.TestCase):
 the(thatConfig.LOGFILE).must.equal(42)
 
 the(thatState).should.have.property('useChangedSettings')
-the(thatState.useChangedSettings).should.be(callable)
+thatState.useChangedSettings.should.be.callable
 thatState.useChangedSettings(thatConfig)
 
 the(thatState.FOO).should.equal('fu')



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

[tor-commits] [bridgedb/develop] Order dependencies alphabetically.

2019-10-03 Thread phw

commit c833e9766cfb414b5f4050eb28fba93cb245d976
Author: Philipp Winter 
Date:   Thu Sep 12 16:37:13 2019 -0700

Order dependencies alphabetically.

This makes it easier to create diffs between our various requirements
files.
---
 .travis.requirements.txt | 12 ++--
 requirements.txt |  6 +++---
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.travis.requirements.txt b/.travis.requirements.txt
index 0669dc4..4d451da 100644
--- a/.travis.requirements.txt
+++ b/.travis.requirements.txt
@@ -13,20 +13,20 @@
 # $ make coverage
 #
 #--
-coverage==4.5.4
-coveralls==1.8.2
-mechanize==0.4.3
-sure==1.4.11
 Babel==2.7.0
 BeautifulSoup==3.2.1
 Mako==1.1.0
-ipaddr==2.2.0
-pygeoip==0.3.2
 PyCryptodome==3.9.0
 Twisted==19.7.0
+coverage==4.5.4
+coveralls==1.8.2
 gnupg==2.3.1
+ipaddr==2.2.0
+mechanize==0.4.3
 pillow==6.1.0
+pygeoip==0.3.2
 qrcode==6.1
 service_identity==18.1.0
 stem==1.7.1
+sure==1.4.11
 zope.interface==4.6.0
diff --git a/requirements.txt b/requirements.txt
index ebf9c96..05d5444 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,13 +1,13 @@
 Babel==2.7.0
 BeautifulSoup==3.2.1
 Mako==1.1.0
+PyCryptodome==3.9.0
 Twisted==19.7.0
+gnupg==2.3.1
 ipaddr==2.2.0
+pillow>=6.1.0
 pyOpenSSL==19.0.0
 pygeoip==0.3.2
-PyCryptodome==3.9.0
-gnupg==2.3.1
-pillow>=6.1.0
 qrcode==6.1
 service_identity==18.1.0
 stem==1.7.1



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

[tor-commits] [bridgedb/develop] Require exactly pillow version 6.1.0.

2019-10-03 Thread phw

commit f78db9b955bdca354dd8db6a1f552d869c1f6cbc
Author: Philipp Winter 
Date:   Thu Sep 12 16:38:26 2019 -0700

Require exactly pillow version 6.1.0.

This makes the pillow requirement consistent with all other
requirements, which are pinned to a specific version.
---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 05d5444..d5a3c9f 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,7 +5,7 @@ PyCryptodome==3.9.0
 Twisted==19.7.0
 gnupg==2.3.1
 ipaddr==2.2.0
-pillow>=6.1.0
+pillow==6.1.0
 pyOpenSSL==19.0.0
 pygeoip==0.3.2
 qrcode==6.1



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

[tor-commits] [bridgedb/develop] Send CI notifications to phw instead of sysrqb.

2019-10-03 Thread phw

commit f24ef482e8a11beeb8ab4e330f47e82b5e9c0db8
Author: Philipp Winter 
Date:   Thu Sep 12 15:45:33 2019 -0700

Send CI notifications to phw instead of sysrqb.
---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 9d30d10..9ec71fc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,7 +11,7 @@ notifications:
 on_failure: always
   email:
 recipients:
-  - sys...@torproject.org
+  - p...@torproject.org
 on_success: never
 on_failure: change
 



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

[tor-commits] [bridgedb/develop] Update pyOpenSSL to version 17.5.0.

2019-10-03 Thread phw

commit 935c3eaa7ad0287d15b276b1098fd4eeed29dd56
Author: Philipp Winter 
Date:   Mon Sep 9 18:28:18 2019 -0700

Update pyOpenSSL to version 17.5.0.

This fixes security vulnerabilities.
---
 .travis.yml  | 18 +-
 requirements.txt |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 26e4d28..9d30d10 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -34,27 +34,27 @@ env:
 - PYTHON_EGG_CACHE="${HOME}/.python-eggs-$(echo $RANDOM$PPID$RANDOM | 
sha256sum | cut -d ' ' -f 1)"
   matrix:
 # What we're running on polyanthum
-- TWISTED_VERSION=16.1.1 PYOPENSSL_VERSION=16.2.0
+- TWISTED_VERSION=16.1.1 PYOPENSSL_VERSION=17.5.0
 # Debian Stretch
-- TWISTED_VERSION=16.6.0 PYOPENSSL_VERSION=16.2.0
+- TWISTED_VERSION=16.6.0 PYOPENSSL_VERSION=17.5.0
 # Debian experimental (all other versions of Debian have the same 
dependency versions right now)
-- TWISTED_VERSION=17.1.0 PYOPENSSL_VERSION=16.2.0
+- TWISTED_VERSION=17.1.0 PYOPENSSL_VERSION=17.5.0
 
 matrix:
   include:
 - python: "pypy"
-  env: TWISTED_VERSION=16.1.1 PYOPENSSL_VERSION=16.2.0
+  env: TWISTED_VERSION=16.1.1 PYOPENSSL_VERSION=17.5.0
 - python: "pypy"
-  env: TWISTED_VERSION=16.6.0 PYOPENSSL_VERSION=16.2.0
+  env: TWISTED_VERSION=16.6.0 PYOPENSSL_VERSION=17.5.0
   allow_failures:
 - python: "2.7"
-  env: TWISTED_VERSION=16.6.0 PYOPENSSL_VERSION=16.2.0
+  env: TWISTED_VERSION=16.6.0 PYOPENSSL_VERSION=17.5.0
 - python: "2.7"
-  env: TWISTED_VERSION=17.1.0 PYOPENSSL_VERSION=16.2.0
+  env: TWISTED_VERSION=17.1.0 PYOPENSSL_VERSION=17.5.0
 - python: "pypy"
-  env: TWISTED_VERSION=16.1.1 PYOPENSSL_VERSION=16.2.0
+  env: TWISTED_VERSION=16.1.1 PYOPENSSL_VERSION=17.5.0
 - python: "pypy"
-  env: TWISTED_VERSION=16.6.0 PYOPENSSL_VERSION=16.2.0
+  env: TWISTED_VERSION=16.6.0 PYOPENSSL_VERSION=17.5.0
   fast_finish: true
 
 before_install:
diff --git a/requirements.txt b/requirements.txt
index b64aec3..0ceccca 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -3,7 +3,7 @@ BeautifulSoup==3.2.1
 Mako==0.8.1
 Twisted==16.1.1
 ipaddr==2.1.11
-pyOpenSSL==16.2.0
+pyOpenSSL==17.5.0
 pygeoip==0.2.7
 PyCryptodome==3.8.2
 gnupg==2.0.1



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

[tor-commits] [bridgedb/develop] Import rfc822 directly instead of over detour.

2019-10-03 Thread phw

commit 15b8e0df097e2cf98c13faf6aabc3236520fa14b
Author: Philipp Winter 
Date:   Thu Sep 12 08:59:50 2019 -0700

Import rfc822 directly instead of over detour.

Some of our code got the rfc822 module over a detour, by importing it
through twisted.mail.smtp.  This is dangerous and only works if
twisted.mail.smtp actually does import rfc822 -- which newer versions
stopped doing.  We're fixing this by doing what we should have been
doing all along: importing the module ourselves.
---
 bridgedb/distributors/email/server.py | 3 ++-
 bridgedb/test/test_email_dkim.py  | 2 +-
 bridgedb/test/test_email_server.py| 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/bridgedb/distributors/email/server.py 
b/bridgedb/distributors/email/server.py
index 229f118..8bd4b36 100644
--- a/bridgedb/distributors/email/server.py
+++ b/bridgedb/distributors/email/server.py
@@ -52,6 +52,7 @@ from __future__ import unicode_literals
 import logging
 import io
 import socket
+import rfc822
 
 from twisted.internet import defer
 from twisted.internet import reactor
@@ -254,7 +255,7 @@ class SMTPMessage(object):
 for line in self.lines:
 rawMessage.writelines(unicode(line.decode('utf8')) + u'\n')
 rawMessage.seek(0)
-return smtp.rfc822.Message(rawMessage)
+return rfc822.Message(rawMessage)
 
 
 class SMTPIncomingDelivery(smtp.SMTP):
diff --git a/bridgedb/test/test_email_dkim.py b/bridgedb/test/test_email_dkim.py
index dc4c53b..be34370 100644
--- a/bridgedb/test/test_email_dkim.py
+++ b/bridgedb/test/test_email_dkim.py
@@ -12,8 +12,8 @@
 """Unittests for the :mod:`bridgedb.distributors.email.dkim` module."""
 
 import io
+import rfc822
 
-from twisted.mail.smtp import rfc822
 from twisted.trial import unittest
 
 from bridgedb.distributors.email import dkim
diff --git a/bridgedb/test/test_email_server.py 
b/bridgedb/test/test_email_server.py
index edf2539..bc331f4 100644
--- a/bridgedb/test/test_email_server.py
+++ b/bridgedb/test/test_email_server.py
@@ -16,6 +16,7 @@ from __future__ import print_function
 import socket
 import string
 import types
+import rfc822
 
 from twisted.python import log
 from twisted.internet import defer
@@ -25,7 +26,6 @@ from twisted.mail.smtp import SMTPBadRcpt
 from twisted.mail.smtp import SMTPBadSender
 from twisted.mail.smtp import User
 from twisted.mail.smtp import Address
-from twisted.mail.smtp import rfc822
 from twisted.test import proto_helpers
 from twisted.trial import unittest
 



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

[tor-commits] [bridgedb/develop] Replace PyCrypto with PyCryptodome.

2019-10-03 Thread phw

commit 75471cdab181759d4e659c3d16265e437151428a
Author: Philipp Winter 
Date:   Mon Sep 9 18:15:18 2019 -0700

Replace PyCrypto with PyCryptodome.

PyCrypto has unfixed security vulnerabilities and is no longer
maintained.  PyCryptodome is a (mostly) drop-in replacement, which does
not have these vulnerabilities.  Let's use PyCryptodome instead.
---
 .travis.requirements.txt | 2 +-
 requirements.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.requirements.txt b/.travis.requirements.txt
index e6eaf10..5c1e433 100644
--- a/.travis.requirements.txt
+++ b/.travis.requirements.txt
@@ -21,8 +21,8 @@ Babel==0.9.6
 BeautifulSoup==3.2.1
 Mako==0.8.1
 ipaddr==2.1.11
-pycrypto==2.6.1
 pygeoip==0.2.7
+PyCryptodome==3.8.2
 gnupg==2.0.1
 pillow>=2.6.1
 qrcode==5.0.1
diff --git a/requirements.txt b/requirements.txt
index d7713df..b64aec3 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -3,9 +3,9 @@ BeautifulSoup==3.2.1
 Mako==0.8.1
 Twisted==16.1.1
 ipaddr==2.1.11
-pycrypto==2.6.1
 pyOpenSSL==16.2.0
 pygeoip==0.2.7
+PyCryptodome==3.8.2
 gnupg==2.0.1
 pillow>=2.6.1
 qrcode==5.0.1



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

[tor-commits] [bridgedb/develop] Add CHANGELOG entry.

2019-10-03 Thread phw

commit edf27d16c44401c2187505f8448915a0353fe334
Author: Philipp Winter 
Date:   Thu Sep 12 15:55:45 2019 -0700

Add CHANGELOG entry.
---
 CHANGELOG | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index c2fca89..48e18eb 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -6,6 +6,12 @@ Changes in version A.B.C - -MM-DD
 also makes our implementation consistent with our (slightly updated)
 specification.
 
+* FIXES https://bugs.torproject.org/29484
+Update BridgeDB's requirements to the latest respective versions.  
Among
+others, this patch set updates Twisted to 19.7.0, pyOpenSSL to 19.0.0,
+and replaces (the abandoned) PyCrypto with PyCryptodome, which fixes
+security vulnerabilities.
+
 Changes in version 0.8.2 - 2019-09-20
 
 Updated translations for the following languages:



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

[tor-commits] [bridgedb/develop] Update stem to version 1.7.1.

2019-10-03 Thread phw

commit 434a30262cc2afabb69fb7bbf2d04c51c9082de4
Author: Philipp Winter 
Date:   Thu Sep 12 16:32:21 2019 -0700

Update stem to version 1.7.1.

There's no reason to use the Tor Project's git repository.
---
 .travis.requirements.txt | 2 +-
 requirements.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.requirements.txt b/.travis.requirements.txt
index 2f8d861..0669dc4 100644
--- a/.travis.requirements.txt
+++ b/.travis.requirements.txt
@@ -28,5 +28,5 @@ gnupg==2.3.1
 pillow==6.1.0
 qrcode==6.1
 service_identity==18.1.0
-git+https://git.torproject.org/stem.git@3eb59411781c4fa210979cb112b800c001a59f6c#egg=stem-1.5.4.dev1-py2.7
+stem==1.7.1
 zope.interface==4.6.0
diff --git a/requirements.txt b/requirements.txt
index 3bb970e..ebf9c96 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -10,5 +10,5 @@ gnupg==2.3.1
 pillow>=6.1.0
 qrcode==6.1
 service_identity==18.1.0
-git+https://git.torproject.org/stem.git@3eb59411781c4fa210979cb112b800c001a59f6c#egg=stem-1.5.4.dev1-py2.7
+stem==1.7.1
 zope.interface==4.6.0



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

[tor-commits] [bridgedb/develop] Request new translations.

2019-10-03 Thread phw

commit a93a636072865c60fa9d1e36dee2d4a5c09355d5
Author: Philipp Winter 
Date:   Thu Oct 3 15:05:38 2019 -0700

Request new translations.

We modified a string in strings.py and should request new translations
for it.  The following command updated bridgedb.pot automatically:

  python setup.py extract_messages
---
 bridgedb/i18n/templates/bridgedb.pot | 312 ++-
 1 file changed, 161 insertions(+), 151 deletions(-)

diff --git a/bridgedb/i18n/templates/bridgedb.pot 
b/bridgedb/i18n/templates/bridgedb.pot
index bc6080f..1607e92 100644
--- a/bridgedb/i18n/templates/bridgedb.pot
+++ b/bridgedb/i18n/templates/bridgedb.pot
@@ -1,24 +1,42 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
-# 
-# Translators:
-# runasand , 2011
+# Translations template for bridgedb.
+# Copyright (C) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
+# FIRST AUTHOR , 2019.
+#
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Tor Project\n"
-"Report-Msgid-Bugs-To: 
'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB=bridgedb-reported,msgid=isis,sysrqb=isis'\n"
-"POT-Creation-Date: 2015-07-25 03:40+\n"
-"PO-Revision-Date: 2017-09-19 09:41+\n"
-"Last-Translator: runasand \n"
-"Language-Team: English 
(http://www.transifex.com/otf/torproject/language/en/)\n"
+"Project-Id-Version: bridgedb 0.8.0+15.gd9d886f.dirty\n"
+"Report-Msgid-Bugs-To: "
+"'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB;
+"=bridgedb-reported,msgid=isis,sysrqb=isis'\n"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME \n"
+"Language-Team: LANGUAGE \n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
-"Language: en\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
+"Generated-By: Babel 2.7.0\n"
+
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates.  (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : Localisations which BridgeDB supports which should be rendered 
right-to-left.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
 #. "BridgeDB"
@@ -30,177 +48,171 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
 msgid "Sorry! Something went wrong with your request."
-msgstr "Sorry! Something went wrong with your request."
+msgstr ""
 
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
 msgid "Report a Bug"
-msgstr "Report a Bug"
+msgstr ""
 
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
 msgid "Source Code"
-msgstr "Source Code"
+msgstr ""
 
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:85
 msgid "Changelog"
-msgstr "Changelog"
-
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Contact"
+msgstr ""
 
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
 msgid "Select All"
-msgstr "Select All"
+msgstr ""
 
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
 msgid "Show QRCode"
-msgstr "Show QRCode"
+msgstr ""
 
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"
-msgstr "QRCode for your bridge lines"
+msgstr ""
 
 #. TRANSLATORS: Please translate this into some silly way to say
 #. "There was a problem!" in your language. For example,
 #. for Italian, you might translate this

[tor-commits] [bridgedb/develop] Use last-available translation to fix unit test.

2019-10-03 Thread phw

commit d9d886f15aad518713a08650002e32abe9cdf73e
Author: Philipp Winter 
Date:   Tue Oct 1 12:04:19 2019 -0700

Use last-available translation to fix unit test.

When we last updated our translations, in commit 968a5db, the Dutch
translation for "What are bridges?" disappared, which broke a unit
test.  This commit re-adds this particular translation -- it does seem
correct, after all.
---
 bridgedb/i18n/nl/LC_MESSAGES/bridgedb.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bridgedb/i18n/nl/LC_MESSAGES/bridgedb.po 
b/bridgedb/i18n/nl/LC_MESSAGES/bridgedb.po
index 1348231..62ada3b 100644
--- a/bridgedb/i18n/nl/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/nl/LC_MESSAGES/bridgedb.po
@@ -268,7 +268,7 @@ msgstr ""
 
 #: bridgedb/strings.py:101
 msgid "What are bridges?"
-msgstr ""
+msgstr "Wat zijn bridges?"
 
 #: bridgedb/strings.py:102
 #, python-format



___
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 'task/31903' into develop

2019-10-03 Thread phw

commit 44d6ed319f8c6f8c43ea0db2eb8c0e64c3d73b50
Merge: 0751ad7 a93a636
Author: Philipp Winter 
Date:   Thu Oct 3 15:16:37 2019 -0700

Merge branch 'task/31903' into develop

 bridgedb/i18n/fr/LC_MESSAGES/bridgedb.po |   9 +-
 bridgedb/i18n/nl/LC_MESSAGES/bridgedb.po |   2 +-
 bridgedb/i18n/templates/bridgedb.pot | 312 ---
 3 files changed, 167 insertions(+), 156 deletions(-)

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

[tor-commits] [bridgedb/develop] Update French translation.

2019-10-03 Thread phw

commit 41e38fca404d70e9c0f8f1ed7895524dc7504ac4
Author: Philipp Winter 
Date:   Mon Sep 30 16:20:06 2019 -0700

Update French translation.
---
 bridgedb/i18n/fr/LC_MESSAGES/bridgedb.po | 9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/bridgedb/i18n/fr/LC_MESSAGES/bridgedb.po 
b/bridgedb/i18n/fr/LC_MESSAGES/bridgedb.po
index 32c57a7..12d091d 100644
--- a/bridgedb/i18n/fr/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/fr/LC_MESSAGES/bridgedb.po
@@ -3,6 +3,7 @@
 # This file is distributed under the same license as the BridgeDB project.
 # 
 # Translators:
+# Translators:
 # AO , 2018-2019
 # apaddlingduck, 2014
 # Boubou , 2015
@@ -30,7 +31,7 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 
'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB=bridgedb-reported,msgid=isis,sysrqb=isis'\n"
 "POT-Creation-Date: 2015-07-25 03:40+\n"
-"PO-Revision-Date: 2019-05-17 16:23+\n"
+"PO-Revision-Date: 2019-09-23 19:14+\n"
 "Last-Translator: AO \n"
 "Language-Team: French 
(http://www.transifex.com/otf/torproject/language/fr/)\n"
 "MIME-Version: 1.0\n"
@@ -121,7 +122,7 @@ msgstr "Ãtape %s1%s"
 #: bridgedb/https/templates/index.html:13
 #, python-format
 msgid "Download %s Tor Browser %s"
-msgstr "TÃ©lÃ©charger %s le NavigateurÂ Tor %s"
+msgstr "TÃ©lÃ©chargez %s le NavigateurÂ Tor %s"
 
 #: bridgedb/https/templates/index.html:25
 #, python-format
@@ -131,7 +132,7 @@ msgstr "Ãtape %s2%s"
 #: bridgedb/https/templates/index.html:27
 #, python-format
 msgid "Get %s bridges %s"
-msgstr "Obtenir des %s ponts %s"
+msgstr "Obtenez des %s ponts %s"
 
 #: bridgedb/https/templates/index.html:36
 #, python-format
@@ -141,7 +142,7 @@ msgstr "Ãtape %s3%s"
 #: bridgedb/https/templates/index.html:38
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
-msgstr "Maintenant, %s ajouter les ponts au navigateur Le NavigateurÂ Tor %s"
+msgstr "Maintenant, %s ajoutez les ponts au NavigateurÂ Tor %s"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!



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

[tor-commits] [community/master] Redirect users to get-in-touch IRC help

2019-10-03 Thread gus

commit 2cd3dbef03beeec1b7fdf972a1a9e8b5a89feb66
Author: Gustavo Gus 
Date:   Thu Oct 3 21:54:14 2019 +

Redirect users to get-in-touch IRC help
---
 content/relay-operations/getting-help/contents.lr | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/content/relay-operations/getting-help/contents.lr 
b/content/relay-operations/getting-help/contents.lr
index cb72875..1ef463b 100644
--- a/content/relay-operations/getting-help/contents.lr
+++ b/content/relay-operations/getting-help/contents.lr
@@ -8,7 +8,7 @@ body:
 
 If you run into problems while setting up your relay, you can ask your 
questions on the public [tor-relays mailing 
list](https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-relays).  The 
list is a great resource for asking (and answering) questions, and for getting 
to know other relay operators. Make sure to check out the archives!
 
-You can also get help by joining the IRC channel #tor-relays in the network 
[irc.oftc.net](https://www.oftc.net).
+You can also get help by joining the IRC channel #tor-relays in the network 
[irc.oftc.net](https://support.torproject.org/get-in-touch/#irc-help).
 
 ---
 html: two-columns-page.html

___
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 'task/31780' into develop

2019-10-03 Thread phw

commit 0751ad7148447f30df7c015c77853d58b6077f71
Merge: e5f83a4 39b6285
Author: Philipp Winter 
Date:   Thu Oct 3 14:28:02 2019 -0700

Merge branch 'task/31780' into develop

 CHANGELOG |  8 +
 bridgedb/main.py  |  2 +-
 bridgedb/metrics.py   | 13 
 bridgedb/test/test_metrics.py |  4 +--
 doc/bridgedb-metrics-spec.txt | 74 +++
 5 files changed, 91 insertions(+), 10 deletions(-)

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

[tor-commits] [bridgedb/develop] Add specification for BridgeDB's metrics format.

2019-10-03 Thread phw

commit 39b6285b28e2826af09bce6a3563f0b1138eac7e
Author: Philipp Winter 
Date:   Wed Sep 18 13:42:47 2019 -0700

Add specification for BridgeDB's metrics format.

We implemented BridgeDB's metrics in 
but haven't specified its format until this patch.

This patch also makes our implementation consistent with our (slightly
updated) specification.  In particular:

* For naming consistency, we changed "bridgedb-stats-version" to
  "bridgedb-metrics-version" and "bridgedb-stats-end" to
  "bridgedb-metrics-end".

* For simplicity, we also changed our version from a major and minor
  number to a single number.

* Instead of appending to our metrics file, we now overwrite the file
  because our specification requires "bridgedb-metrics-end" and
  "bridgedb-metrics-version" to be there exactly once.
---
 CHANGELOG |  8 +
 bridgedb/main.py  |  2 +-
 bridgedb/metrics.py   | 13 
 bridgedb/test/test_metrics.py |  4 +--
 doc/bridgedb-metrics-spec.txt | 74 +++
 5 files changed, 91 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 06968d2..c2fca89 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,11 @@
+Changes in version A.B.C - -MM-DD
+
+* FIXES https://bugs.torproject.org/31780
+We implemented BridgeDB's metrics in #9316 but haven't specified its
+format until now.  In addition to adding a specification, this patch
+also makes our implementation consistent with our (slightly updated)
+specification.
+
 Changes in version 0.8.2 - 2019-09-20
 
 Updated translations for the following languages:
diff --git a/bridgedb/main.py b/bridgedb/main.py
index 94f4921..7c2df6d 100644
--- a/bridgedb/main.py
+++ b/bridgedb/main.py
@@ -85,7 +85,7 @@ def writeMetrics(filename, measurementInterval):
 logging.debug("Dumping metrics to file: '%s'" % filename)
 
 try:
-with open(filename, 'a') as fh:
+with open(filename, 'w') as fh:
 metrics.export(fh, measurementInterval)
 except IOError as err:
 logging.error("Failed to write metrics to '%s': %s" % (filename, err))
diff --git a/bridgedb/metrics.py b/bridgedb/metrics.py
index 4e1c880..5e14146 100644
--- a/bridgedb/metrics.py
+++ b/bridgedb/metrics.py
@@ -9,7 +9,7 @@
 # :license: see LICENSE for licensing information
 # _
 
-"""API for keeping track of BridgeDB statistics, e.g., the demand for bridges
+"""API for keeping track of BridgeDB metrics, e.g., the demand for bridges
 over time.
 """
 
@@ -53,9 +53,9 @@ SUBNET_CTR_PREFIX_LEN = 20
 # All of the pluggable transports BridgeDB currently supports.
 SUPPORTED_TRANSPORTS = None
 
-# Major and minor version number for our statistics format.
-METRICS_MAJOR_VERSION = 1
-METRICS_MINOR_VERSION = 0
+# Version number for our metrics format.  We increment the version if our
+# format changes.
+METRICS_VERSION = 1
 
 
 def setProxies(proxies):
@@ -120,11 +120,10 @@ def export(fh, measurementInterval):
 logging.debug("Metrics module knows about %d proxies." % numProxies)
 
 now = datetime.datetime.utcnow()
-fh.write("bridgedb-stats-end %s (%d s)\n" % (
+fh.write("bridgedb-metrics-end %s (%d s)\n" % (
  now.strftime("%Y-%m-%d %H:%M:%S"),
  measurementInterval))
-fh.write("bridgedb-stats-version %d.%d\n" % (METRICS_MAJOR_VERSION,
- METRICS_MINOR_VERSION))
+fh.write("bridgedb-metrics-version %d\n" % METRICS_VERSION)
 
 httpsLines = httpsMetrix.getMetrics()
 for line in httpsLines:
diff --git a/bridgedb/test/test_metrics.py b/bridgedb/test/test_metrics.py
index a870fc2..a27431c 100644
--- a/bridgedb/test/test_metrics.py
+++ b/bridgedb/test/test_metrics.py
@@ -110,8 +110,8 @@ class StateTest(unittest.TestCase):
 self.assertTrue(len(pseudo_fh.getvalue()) > 0)
 
 lines = pseudo_fh.getvalue().split("\n")
-self.assertTrue(lines[0].startswith("bridgedb-stats-end"))
-self.assertTrue(lines[1].startswith("bridgedb-stats-version"))
+self.assertTrue(lines[0].startswith("bridgedb-metrics-end"))
+self.assertTrue(lines[1].startswith("bridgedb-metrics-version"))
 self.assertTrue(lines[2] ==
 "bridgedb-metric-count https.obfs4.de.success.None 10")
 
diff --git a/doc/bridgedb-metrics-spec.txt b/doc/bridgedb-metrics-spec.txt
new file mode 100644
index 000..14c38f9
--- /dev/null
+++ b/doc/bridgedb-metrics-spec.txt
@@ -0,0 +1,74 @@
+  BridgeDB metrics (version 1)
+
+BridgeDB exports usage metrics once every 24 hours.  These metrics
+encode how many approximate successful/failed requests BridgeDB has seen
+per distribution mechanism, per pluggable transport, per country code

[tor-commits] [community/master] Merge branch 'patch-5'

2019-10-03 Thread gus

commit 74e3edb5fcc12d7830749dc21b3aae303e3df3e6
Merge: 6910083 4cbe0a2
Author: gus 
Date:   Thu Oct 3 17:11:15 2019 -0400

Merge branch 'patch-5'

 .../relay-operations/technical-setup/bridge/debian-ubuntu/contents.lr   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

[tor-commits] [community/master] Replace Debian repository instructions to Support portal

2019-10-03 Thread gus

commit 4cbe0a2a48d5845b2f44f4001ed9cff12d901611
Author: Gustavo Gus 
Date:   Fri Sep 27 17:49:45 2019 +

Replace Debian repository instructions to Support portal
---
 .../relay-operations/technical-setup/bridge/debian-ubuntu/contents.lr   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/content/relay-operations/technical-setup/bridge/debian-ubuntu/contents.lr 
b/content/relay-operations/technical-setup/bridge/debian-ubuntu/contents.lr
index b97259c..9596a38 100644
--- a/content/relay-operations/technical-setup/bridge/debian-ubuntu/contents.lr
+++ b/content/relay-operations/technical-setup/bridge/debian-ubuntu/contents.lr
@@ -10,7 +10,7 @@ body:
 
 Get the latest version of Tor. If you're on Debian stable, `sudo apt-get 
install tor` should give you the latest stable version of Tor.
 
-* Note: **Ubuntu users need to get it from Tor repository. Please see** 
[Download instructions for 
Ubuntu](https://www.torproject.org/docs/debian.html.en#ubuntu).
+* Note: **Ubuntu users need to get it from Tor repository. Please see** 
[Download instructions for 
Ubuntu](https://support.torproject.org/apt/tor-deb-repo/).
 
 ### 2. Install obfs4proxy
 



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

[tor-commits] [community/master] add OpenBSD setup for middle/guard relays (@)

2019-10-03 Thread gus

commit db2e96faa6e7c70388ffaf898e5e4752d1730538
Author: Vinicius Zavam 
Date:   Thu Oct 3 18:02:58 2019 +

add OpenBSD setup for middle/guard relays (@)<
  - recommend using more recent package, from M:Tier;
  - cover the use of 'openup' to update packages;
  - tune system's limits to operate a fine relay (fix trac ticket 27489 
[0]).

[0] https://trac.torproject.org/projects/tor/ticket/27489
---
 .../technical-setup/guard/openbsd/contents.lr  | 94 ++
 1 file changed, 94 insertions(+)

diff --git a/content/relay-operations/technical-setup/guard/openbsd/contents.lr 
b/content/relay-operations/technical-setup/guard/openbsd/contents.lr
new file mode 100644
index 000..24a5dd7
--- /dev/null
+++ b/content/relay-operations/technical-setup/guard/openbsd/contents.lr
@@ -0,0 +1,94 @@
+_model: page
+---
+color: primary
+---
+title: OpenBSD
+---
+body:
+
+# 1. Install `tor` OpenBSD's Package
+
+Recent OpenBSD systems, like 6.5/amd64, already have the repository configured 
on `/etc/installurl` so we do not need to bother changing it.
+
+Should that's not your case, please adjust the `installurl` configuration file 
like this:
+
+```
+echo "https://cdn.openbsd.org/pub/OpenBSD; > /etc/installurl
+```
+
+Proceed with `pkg_add` to install the package:
+
+```
+pkg_add tor
+```
+
+### 2.1. Recommended Steps to Install `tor` on OpenBSD
+
+If you want to install a newer version of the `tor` OpenBSD's package, you can 
use M:Tier's binary packages:
+
+```
+ftp https://stable.mtier.org/openup
+```
+
+Right after fetching `openup` you can run it to sync M:Tier's repository and 
update your packages; it's an alternative to `pkg_add -u`.
+
+Here is how you proceed with these steps:
+
+```
+openup
+```
+
+# 3. Configure `/etc/tor/torrc`
+
+This is a very simple version of the `torrc` configuration file in order to 
run a Middle/Guard relay on the Tor network:
+
+```
+NicknamemyBSDRelay# Change your relay's nickname to something you like
+ContactInfo your@email# Please write your email address and be aware that 
it will be published
+ORPort  443   # You might want to use/try a different port, should 
you want to
+ExitRelay   0
+SocksPort   0
+Log notice  syslog
+User_tor
+```
+
+# 4. Change `openfiles-max` and `maxfiles` Tweaks
+
+By default, OpenBSD maintains a rather low limit on the maximum number of open 
files for a process. For a daemon such as Tor's, that opens a connection to 
each and every other relay (currently around 7000 relays), these limits should 
be raised.
+
+Append the following section to `/etc/login.conf`:
+
+```
+tor:\
+:openfiles-max=13500:\
+:tc=daemon:
+```
+
+OpenBSD also stores a kernel-level file descriptor limit in the sysctl 
variable `kern.maxfiles`.
+
+Increase it from the default of 7030 to 16000:
+
+```
+echo "kern.maxfiles=16000" >> /etc/sysctl.conf
+sysctl kern.maxfiles=16000
+```
+
+# 6. Start `tor`:
+
+Here we set `tor` to start during boot and call it for the first time:
+
+```
+rcctl enable tor
+rcctl start tor
+```
+
+---
+html: two-columns-page.html
+---
+key: 2
+---
+section: Middle/Guard relay
+---
+section_id: relay-operations
+---
+subtitle: How to deploy a Middle/Guard relay on OpenBSD



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

[tor-commits] [community/master] hello DragonFlyBSD!

2019-10-03 Thread gus

commit dbfe843d265cb7df664104898fd3f24a0ccded34
Author: Vinicius Zavam 
Date:   Thu Oct 3 18:43:34 2019 +

hello DragonFlyBSD!
  - avoid pushing people to use DPorts, as we have `pkg` :)
---
 .../technical-setup/guard/dragonflybsd/contents.lr | 99 ++
 1 file changed, 99 insertions(+)

diff --git 
a/content/relay-operations/technical-setup/guard/dragonflybsd/contents.lr 
b/content/relay-operations/technical-setup/guard/dragonflybsd/contents.lr
new file mode 100644
index 000..8218178
--- /dev/null
+++ b/content/relay-operations/technical-setup/guard/dragonflybsd/contents.lr
@@ -0,0 +1,99 @@
+_model: page
+---
+color: primary
+---
+title: DragonflyBSD
+---
+body:
+
+# 1. Bootstrap `pkg`
+
+DragonFlyBSD's daily snapshots and releases (starting with 3.4) come with 
`pkg` already installed. Upgrades from earlier releases, however, will not have 
it.
+
+If `pkg` is missing on the system for any reason, it can be quickly 
bootstrapped without having to build it from source or even having **DPorts** 
installed:
+
+```
+cd /usr
+make pkg-bootstrap
+rehash
+pkg-static install -y pkg
+rehash
+```
+
+### 1.1. Recommended Steps to Setup `pkg`
+
+Here, it will be similar to what we have on a **FreeBSD** system, and we are 
going to use HTTPS to fetch our packages, and updates - so here we also need an 
extra package to help us out (ca_root_nss).
+
+Installing the `ca_root_nss` package:
+
+```
+pkg install ca_root_nss
+```
+
+For fresh installations, the file 
`/usr/local/etc/pkg/repos/df-latest.conf.sample` is copied to 
`/usr/local/etc/pkg/repos/df-latest`. The files ending in the ".sample" 
extension are ignored; pkg(8) only reads files that end in ".conf" and it will 
read as many as it finds.
+
+DragonflyBSD has 2 packages repositories:
+
+  - Avalon (mirror-master.dragonflybsd.org);
+  - Wolfpond (pkg.wolfpond.org).
+
+We can simply edit the **URL** used to point out the repositories on 
`/usr/local/etc/pkg/repos/df-latest` and that's it! Remember to use 
**pkg+https://** for Avalon.
+
+After applying all these changes, we update the packages list again and try to 
check if there's already a new update to apply:
+
+```
+pkg update -f
+pkg upgrade -y -f
+```
+
+# 2. Install `tor` DragonflyBSD's Package
+
+Here we can choose to install the latest stable version, like:
+
+```
+pkg install tor
+```
+
+  ... or install an alpha release:
+
+
+```
+pkg install tor-devel
+```
+
+# 3. Configure `/usr/local/etc/tor/torrc`
+
+This is a very simple version of the `torrc` configuration file in order to 
run a Middle/Guard relay on the Tor network:
+
+```
+NicknamemyBSDRelay# Change your relay's nickname to something you like
+ContactInfo your@email# Please write your email address and be aware that 
it will be published
+ORPort  443   # You might want to use/try a different port, should 
you want to
+ExitRelay   0
+SocksPort   0
+Log notice  syslog
+```
+
+# 4. Start `tor`:
+
+Here we set `tor` to start at boot time and use the setuid feature, in order 
to bind to lower ports like 443 (the daemon itself will still run as a regular 
non-privileged user).
+
+```
+echo "tor_setuid=YES" >> /etc/rc.conf
+echo "tor_enable=YES" >> /etc/rc.conf
+service tor start
+```
+
+# 5. Final Notes
+
+If you are having troubles setting up your relay, have a look at our [help 
section](/relay/getting-help/). If your relay is now running, check out the 
[post-install](/relay/setup/post-install/) notes.
+---
+html: two-columns-page.html
+---
+key: 2
+---
+section: Middle/Guard relay
+---
+section_id: relay-operations
+---
+subtitle: How to deploy a Middle/Guard relay on DragonflyBSD



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

[tor-commits] [community/master] update FreeBSD setup guide for middle/guard relays;

2019-10-03 Thread gus

commit 6910083da66d719b880069e6a3a21c3ef00677a1
Author: Vinicius Zavam 
Date:   Thu Oct 3 17:49:49 2019 +

update FreeBSD setup guide for middle/guard relays;
  - ensure we cover also pkg's bootstrap (for vanila systems w/o any 
available package);
  - track the 'latest' branch used by pkg to get more frequent packages 
updates;
  - use HTTPS:// on the repository url (needs extra package, ca_root_nss);
  - cover starting our daemon on port 443, but still as '_tor' non-root 
user.
---
 .../technical-setup/guard/freebsd/contents.lr  | 104 ++---
 1 file changed, 69 insertions(+), 35 deletions(-)

diff --git a/content/relay-operations/technical-setup/guard/freebsd/contents.lr 
b/content/relay-operations/technical-setup/guard/freebsd/contents.lr
index b442ca8..8744d31 100644
--- a/content/relay-operations/technical-setup/guard/freebsd/contents.lr
+++ b/content/relay-operations/technical-setup/guard/freebsd/contents.lr
@@ -6,68 +6,102 @@ title: FreeBSD
 ---
 body:
 
-# 1. Enable Automatic Software Updates
+# 1. Enable Automatic Updates for Packages
 
 One of the most imported things to keeps your relay secure is to install 
security updates timely and ideally automatically so you can not forget about 
it. Follow the instructions to enable [automatic software updates](updates) for 
your operating system.
 
-# 2. Install the tor package
+# 2. Bootstrap `pkg`
 
-`pkg install tor ca_root_nss`
+This article considers we have already a base installation of FreeBSD running, 
and only the base system (here, we are running 12.0-RELEASE). That means we do 
not have any packages installed neither the `pkg` packages manager itself 
(there's no `sudo` available - we are running commands as root).
 
-or for alpha releases:
+To bootstrap and install `pkg` we should run the following command:
 
-`pkg install tor-devel ca_root_nss`
+```
+pkg bootstrap
+pkg update -f
+```
+
+### 2.1. Recommended Steps to Setup `pkg`
+
+To follow upstream updates in a "faster way" we recommend changing the 
'quarterly' branch used by `pkg` to its 'latest' branch.
+
+One additional step is to prefer using HTTPS to fetch our packages, and 
updates - so here we also need an extra package to help us out (ca_root_nss).
 
-# 3. Put the configuration file `/usr/local/etc/tor/torrc` in place
+Installing the `ca_root_nss` package:
 
 ```
-#change the nickname "myNiceRelay" to a name that you like
-Nickname myNiceRelay
-ORPort 9001
-ExitRelay 0
-SocksPort 0
-# Change the email address bellow and be aware that it will be published
-ContactInfo tor-operator@your-emailaddress-domain
-Log notice syslog
+pkg install ca_root_nss
 ```
 
-# 4. Ensure that the `random_id` sysctl setting is enabled:
+We are keeping the original setting used by `pkg` but setting a new one that 
will override it, so we set up a new directory and than create a configuration 
file to override what we need. This configuration file will be 
`/usr/local/etc/pkg/repos/FreeBSD.conf`.
+
+Creating the new directory:
 
 ```
-echo "net.inet.ip.random_id=1" >> /etc/sysctl.conf
-sysctl net.inet.ip.random_id=1
+mkdir -p /usr/local/etc/pkg/repos
 ```
 
-# 5. Start the tor daemon and make sure it starts at boot:
+This is how the new configuration file `/usr/local/etc/pkg/repos/FreeBSD.conf` 
must look like:
 
 ```
-sysrc tor_enable=YES
-service tor start
+FreeBSD: {
+  url: pkg+https://pkg.freebsd.org/${ABI}/latest
+}
 ```
 
-### Optional but recommended
+After applying all these changes, we update the packages list again and try to 
check if there's already a new update to apply:
 
-To get package updates faster after they have been build it is best to switch 
from the "quarterly" with "latest" repository.
+```
+pkg update -f
+pkg upgrade -y -f
+```
 
-Create the following folder:
+# 3. Install `tor` FreeBSD's Package
 
-`mkdir -p /usr/local/etc/pkg/repos`
+Here we can choose to install the latest stable version, like:
 
-and create the file `/usr/local/etc/pkg/repos/FreeBSD.conf` with the following 
content:
+```
+pkg install tor
+```
+
+  ... or install an alpha release:
 
+
+```
+pkg install tor-devel
 ```
-FreeBSD: { enabled: no }
 
-FreeBSDlatest: {
-  url: "pkg+https://pkg.FreeBSD.org/${ABI}/latest;,
-  mirror_type: "srv",
-  signature_type: "fingerprints",
-  fingerprints: "/usr/share/keys/pkg",
-  enabled: yes
-}
+# 4. Configure `/usr/local/etc/tor/torrc`
+
+This is a very simple version of the `torrc` configuration file in order to 
run a Middle/Guard relay on the Tor network:
+
+```
+NicknamemyBSDRelay# Change your relay's nickname to something you like
+ContactInfo your@email# Please write your email address and be aware that 
it will be published
+ORPort  443   # You might want to use/try a different port, should 
you want to
+ExitRelay   0
+SocksPort   0
+Log notice  syslog
+```
+
+# 5. Ensure `net.inet.ip.random_id` is enabled:
+
+```
+echo "net.inet.ip.random_id=1" >> /etc/sysctl.conf
+sysctl net.inet.ip.random_id=1

[tor-commits] [community/master] present NetBSD to awesome people willing to support Tor :)

2019-10-03 Thread gus

commit d01fcd5fe64822fc1fd50fa3b9e778ac5295b207
Author: Vinicius Zavam 
Date:   Thu Oct 3 18:14:35 2019 +

present NetBSD to awesome people willing to support Tor :)
  - this commit kinda mirrors the up to date wiki page to the new community 
portal;
  - all fine from 'wiki/TorRelayGuide/NetBSD';
  - keeping the standards for all *BSD guides, working out of the box for 
vanilla systems.
---
 .../technical-setup/guard/netbsd/contents.lr   | 51 ++
 1 file changed, 51 insertions(+)

diff --git a/content/relay-operations/technical-setup/guard/netbsd/contents.lr 
b/content/relay-operations/technical-setup/guard/netbsd/contents.lr
new file mode 100644
index 000..688cbce
--- /dev/null
+++ b/content/relay-operations/technical-setup/guard/netbsd/contents.lr
@@ -0,0 +1,51 @@
+_model: page
+---
+color: primary
+---
+title: NetBSD
+---
+body:
+
+# 1. Setup `pkg_add`
+
+```
+echo "PKG_PATH=http://cdn.netbsd.org/pub/pkgsrc/packages/NetBSD/$(uname 
-m)/$(uname -r)/All" > /etc/pkg_install.conf
+```
+
+# 2. Install `tor` NetBSD's package
+
+```
+pkg_add tor
+```
+
+# 3. Configure `/usr/pkg/etc/tor/torrc`
+
+```
+NicknamemyBSDRelay# Change your relay's nickname to something you like
+ContactInfo your@email# Please write your email address and be aware that 
it will be published
+ORPort  443   # You might want to use/try a different port, should 
you want to
+ExitRelay   0
+SocksPort   0
+Log notice  syslog
+```
+
+# 6. Start `tor`:
+
+Here we set `tor` to start during boot and call it for the first time:
+
+```
+ln -sf /usr/pkg/share/examples/rc.d/tor /etc/rc.d/tor
+echo "tor=YES" >> /etc/rc.conf
+/etc/rc.d/tor start
+```
+
+---
+html: two-columns-page.html
+---
+key: 2
+---
+section: Middle/Guard relay
+---
+section_id: relay-operations
+---
+subtitle: How to deploy a Middle/Guard relay on NetBSD



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

[tor-commits] [tor-browser/tor-browser-68.1.0esr-9.0-2] Bug 31935: Disable profile downgrade protection.

2019-10-03 Thread gk

commit d375c811357fc32f7f0d2e399ebb9edb2764eb76
Author: Kathy Brade 
Date:   Thu Oct 3 15:27:00 2019 -0400

Bug 31935: Disable profile downgrade protection.

Since Tor Browser does not support more than one profile, disable
the prompt and associated code that offers to create one when a
version downgrade situation is detected.
---
 browser/moz.configure | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/browser/moz.configure b/browser/moz.configure
index 43bc0c1fe59b..f0f0f07e23f3 100644
--- a/browser/moz.configure
+++ b/browser/moz.configure
@@ -8,7 +8,7 @@ imply_option('MOZ_PLACES', True)
 imply_option('MOZ_SERVICES_HEALTHREPORT', True)
 imply_option('MOZ_SERVICES_SYNC', True)
 imply_option('MOZ_DEDICATED_PROFILES', False)
-imply_option('MOZ_BLOCK_PROFILE_DOWNGRADE', True)
+imply_option('MOZ_BLOCK_PROFILE_DOWNGRADE', False)
 
 with only_when(target_is_linux & compile_environment):
 option(env='MOZ_NO_PIE_COMPAT',

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

[tor-commits] [tor-browser-build/master] Bug 30463: Explicitly disable MOZ_TELEMETRY_REPORTING

2019-10-03 Thread gk

commit 44d7ffc62c3df306a5e85d80d7607586f9c4d677
Author: Alex Catarineu 
Date:   Thu Oct 3 16:15:40 2019 +0200

Bug 30463: Explicitly disable MOZ_TELEMETRY_REPORTING
---
 projects/firefox/mozconfig-android-aarch64 | 3 +++
 projects/firefox/mozconfig-android-armv7   | 3 +++
 projects/firefox/mozconfig-android-x86 | 3 +++
 projects/firefox/mozconfig-android-x86_64  | 3 +++
 projects/firefox/mozconfig-linux-i686  | 3 +++
 projects/firefox/mozconfig-linux-x86_64| 3 +++
 projects/firefox/mozconfig-osx-x86_64  | 3 +++
 projects/firefox/mozconfig-windows-i686| 3 +++
 projects/firefox/mozconfig-windows-x86_64  | 3 +++
 9 files changed, 27 insertions(+)

diff --git a/projects/firefox/mozconfig-android-aarch64 
b/projects/firefox/mozconfig-android-aarch64
index ddc0fe1..9e4173f 100644
--- a/projects/firefox/mozconfig-android-aarch64
+++ b/projects/firefox/mozconfig-android-aarch64
@@ -44,3 +44,6 @@ ac_add_options --disable-webrtc
 
 ac_add_options --without-google-play-services
 ac_add_options --enable-proxy-bypass-protection
+
+# Disable telemetry
+ac_add_options MOZ_TELEMETRY_REPORTING=
\ No newline at end of file
diff --git a/projects/firefox/mozconfig-android-armv7 
b/projects/firefox/mozconfig-android-armv7
index e5d2dc3..d13f870 100644
--- a/projects/firefox/mozconfig-android-armv7
+++ b/projects/firefox/mozconfig-android-armv7
@@ -44,3 +44,6 @@ ac_add_options --disable-webrtc
 
 ac_add_options --without-google-play-services
 ac_add_options --enable-proxy-bypass-protection
+
+# Disable telemetry
+ac_add_options MOZ_TELEMETRY_REPORTING=
\ No newline at end of file
diff --git a/projects/firefox/mozconfig-android-x86 
b/projects/firefox/mozconfig-android-x86
index cdaa87c..019094c 100644
--- a/projects/firefox/mozconfig-android-x86
+++ b/projects/firefox/mozconfig-android-x86
@@ -44,3 +44,6 @@ ac_add_options --disable-webrtc
 
 ac_add_options --without-google-play-services
 ac_add_options --enable-proxy-bypass-protection
+
+# Disable telemetry
+ac_add_options MOZ_TELEMETRY_REPORTING=
\ No newline at end of file
diff --git a/projects/firefox/mozconfig-android-x86_64 
b/projects/firefox/mozconfig-android-x86_64
index 17c3906..999f51f 100644
--- a/projects/firefox/mozconfig-android-x86_64
+++ b/projects/firefox/mozconfig-android-x86_64
@@ -45,3 +45,6 @@ ac_add_options --disable-webrtc
 ac_add_options --without-google-play-services
 
 ac_add_options --enable-proxy-bypass-protection
+
+# Disable telemetry
+ac_add_options MOZ_TELEMETRY_REPORTING=
\ No newline at end of file
diff --git a/projects/firefox/mozconfig-linux-i686 
b/projects/firefox/mozconfig-linux-i686
index 95d14c1..87b64d7 100755
--- a/projects/firefox/mozconfig-linux-i686
+++ b/projects/firefox/mozconfig-linux-i686
@@ -36,3 +36,6 @@ ac_add_options --enable-proxy-bypass-protection
 
 # Bug 31448: ld.gold fails if we don't disable debug-symbols
 ac_add_options --disable-debug-symbols
+
+# Disable telemetry
+ac_add_options MOZ_TELEMETRY_REPORTING=
\ No newline at end of file
diff --git a/projects/firefox/mozconfig-linux-x86_64 
b/projects/firefox/mozconfig-linux-x86_64
index e0a764f..19d2885 100755
--- a/projects/firefox/mozconfig-linux-x86_64
+++ b/projects/firefox/mozconfig-linux-x86_64
@@ -33,3 +33,6 @@ ac_add_options --disable-webrtc
 # Let's make sure no preference is enabling either Adobe's or Google's CDM.
 ac_add_options --disable-eme
 ac_add_options --enable-proxy-bypass-protection
+
+# Disable telemetry
+ac_add_options MOZ_TELEMETRY_REPORTING=
\ No newline at end of file
diff --git a/projects/firefox/mozconfig-osx-x86_64 
b/projects/firefox/mozconfig-osx-x86_64
index 29e6617..8fa7885 100644
--- a/projects/firefox/mozconfig-osx-x86_64
+++ b/projects/firefox/mozconfig-osx-x86_64
@@ -46,3 +46,6 @@ ac_add_options --disable-tests
 # Let's make sure no preference is enabling either Adobe's or Google's CDM.
 ac_add_options --disable-eme
 ac_add_options --enable-proxy-bypass-protection
+
+# Disable telemetry
+ac_add_options MOZ_TELEMETRY_REPORTING=
\ No newline at end of file
diff --git a/projects/firefox/mozconfig-windows-i686 
b/projects/firefox/mozconfig-windows-i686
index 60cf1c1..685b294 100644
--- a/projects/firefox/mozconfig-windows-i686
+++ b/projects/firefox/mozconfig-windows-i686
@@ -40,3 +40,6 @@ ac_add_options --disable-webrtc # Bug 1393901
 ac_add_options --disable-tests
 ac_add_options --disable-jemalloc # Bug 154751
 ac_add_options --disable-geckodriver # Bug 1489320
+
+# Disable telemetry
+ac_add_options MOZ_TELEMETRY_REPORTING=
\ No newline at end of file
diff --git a/projects/firefox/mozconfig-windows-x86_64 
b/projects/firefox/mozconfig-windows-x86_64
index 2a128ae..92c774c 100644
--- a/projects/firefox/mozconfig-windows-x86_64
+++ b/projects/firefox/mozconfig-windows-x86_64
@@ -40,3 +40,6 @@ ac_add_options --disable-webrtc # Bug 1393901
 ac_add_options --disable-tests
 ac_add_options --disable-jemalloc # Bug 1547519
 ac_add_options --disable-geckodriver # Bug 1489320
+
+# Disable telemetry
+ac_add_options

[tor-commits] [tor/master] Pick a release date for 0.4.2.2-alpha

2019-10-03 Thread nickm

commit c8df2c720501fc8a3f96c34fcef0bced4498deb0
Author: Nick Mathewson 
Date:   Thu Oct 3 14:58:51 2019 -0400

Pick a release date for 0.4.2.2-alpha
---
 ChangeLog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index bddac3825..59ded0082 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-Changes in version 0.4.2.2-alpha - 2019-10-0?
+Changes in version 0.4.2.2-alpha - 2019-10-07
   This release fixes several bugs from the previous alpha release, and
   from earlier versions. It also includes a change in authorities, so
   that they begin to reject the currently unsupported release series.

___
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

2019-10-03 Thread translation

commit e7ef197f67bb0113e3ff8d7991584bc1b2ec159c
Author: Translation commit bot 
Date:   Thu Oct 3 18:52:50 2019 +

https://gitweb.torproject.org/translation.git/commit/?h=tpo-web
---
 contents+lt.po | 63 +-
 1 file changed, 32 insertions(+), 31 deletions(-)

diff --git a/contents+lt.po b/contents+lt.po
index 0e7f4b832..741277ca0 100644
--- a/contents+lt.po
+++ b/contents+lt.po
@@ -1,8 +1,8 @@
 # Translators:
 # Benas Buivydas , 2019
-# Tautvydas Å½., 2019
 # erinm, 2019
 # Moo, 2019
+# Tautvydas Å½., 2019
 # 
 msgid ""
 msgstr ""
@@ -10,7 +10,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-10-02 19:24+CET\n"
 "PO-Revision-Date: 2019-03-09 10:41+\n"
-"Last-Translator: Moo, 2019\n"
+"Last-Translator: Tautvydas Å½., 2019\n"
 "Language-Team: Lithuanian (https://www.transifex.com/otf/teams/1519/lt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -877,7 +877,7 @@ msgstr "APGINKITE SAVE"
 
 #: templates/hero-download-tor.html:2
 msgid "GROW THE NETWORK"
-msgstr ""
+msgstr "PLÄSKITE TINKLÄ"
 
 #: templates/hero-download.html:2
 msgid "Defend yourself."
@@ -885,15 +885,15 @@ msgstr "Apginkite save."
 
 #: templates/hero-download.html:45
 msgid "Download in another language or platform"
-msgstr ""
+msgstr "AtsisiÅ³sti kita kalba arba platforma"
 
 #: templates/hero-download.html:46
 msgid "Download the latest alpha build"
-msgstr ""
+msgstr "AtsisiÅ³sti naujausiÄ alfa versijÄ"
 
 #: templates/hero-download.html:50
 msgid "Read the latest release announcements"
-msgstr ""
+msgstr "Skaityti naujausio leidimo praneÅ¡imus"
 
 #: templates/hero-home.html:2
 msgid "Browse Privately."
@@ -910,11 +910,11 @@ msgstr ""
 
 #: templates/home.html:7
 msgid "Block Trackers"
-msgstr ""
+msgstr "Blokuokite sekiklius"
 
 #: templates/home.html:11
 msgid "BLOCK TRACKERS"
-msgstr ""
+msgstr "BLOKUOKITE SEKIKLIUS"
 
 #: templates/home.html:12
 msgid ""
@@ -929,7 +929,7 @@ msgstr ""
 
 #: templates/home.html:28
 msgid "DEFEND AGAINST SURVEILLANCE"
-msgstr ""
+msgstr "APSIGINKITE NUO SEKIMO"
 
 #: templates/home.html:29
 msgid ""
@@ -954,11 +954,11 @@ msgstr ""
 
 #: templates/home.html:58
 msgid "Multi-layered Encryption"
-msgstr ""
+msgstr "Daugiasluoksnis Å¡ifravimas"
 
 #: templates/home.html:62
 msgid "MULTI-LAYERED ENCRYPTION"
-msgstr ""
+msgstr "DAUGIASLUOKSNIS Å IFRAVIMAS"
 
 #: templates/home.html:63
 msgid ""
@@ -983,17 +983,17 @@ msgstr ""
 
 #: templates/jobs.html:2
 msgid "Current Openings"
-msgstr ""
+msgstr "Laisvos vietos"
 
 #: templates/jobs.html:13
 msgid ""
 "At the moment, we don't have any official open positions. Please check back "
 "soon, though!"
-msgstr ""
+msgstr "Å iuo metu laisvÅ³ oficialiÅ³ vietÅ³ neturime. PraÅ¡ome pabandyti 
vÄliau!"
 
 #: templates/jobs.html:18 templates/projects.html:5
 msgid "Previous Openings"
-msgstr ""
+msgstr "BuvÄ vietos"
 
 #: templates/jobs.html:32 templates/projects.html:33
 msgid ""
@@ -1004,10 +1004,11 @@ msgstr ""
 #: templates/jobs.html:32 templates/projects.html:33
 msgid "We invite you to join us on IRC to find how you can get involved."
 msgstr ""
+"KvieÄiame prisijungti prie mÅ«sÅ³ IRC, kad suÅ¾inotumÄte kaip galite 
prisidÄti."
 
 #: templates/meta.html:11
 msgid "The Tor Project | Privacy & Freedom Online"
-msgstr ""
+msgstr "Tor Project | Privatumas ir LaisvÄ Internete"
 
 #: templates/meta.html:17
 msgid "Tor Project"
@@ -1015,11 +1016,11 @@ msgstr "Tor projektas"
 
 #: templates/people.html:2
 msgid "Board of Directors"
-msgstr ""
+msgstr "DirektoriÅ³ valdyba"
 
 #: templates/people.html:3 templates/people.html:15
 msgid "Core Tor"
-msgstr ""
+msgstr "Tor branduolys"
 
 #: templates/people.html:28
 msgid "Join Our Team"
@@ -1034,27 +1035,27 @@ msgstr ""
 
 #: templates/people.html:31
 msgid "Sign up for tor-dev"
-msgstr ""
+msgstr "Prisijunkite prie  tor-dev"
 
 #: templates/press.html:7
 msgid "Get support"
-msgstr ""
+msgstr "Gaukite pagalbos"
 
 #: templates/press.html:9
 msgid "Visit our Support Portal"
-msgstr ""
+msgstr "Aplankykite mÅ«sÅ³ pagalbos portalÄ"
 
 #: templates/press.html:12
 msgid "Ask us on #tor"
-msgstr ""
+msgstr "UÅ¾duokite klausimÄ #tor"
 
 #: templates/press.html:15
 msgid "Write to a mailing list"
-msgstr ""
+msgstr "ParaÅ¡ykite Ä¯ el. paÅ¡to grupÄ"
 
 #: templates/press.html:22
 msgid "Brand Assets"
-msgstr ""
+msgstr "PrekÄs Å¾enklo turtas"
 
 #: templates/press.html:27
 msgid "The Tor Browser"
@@ -1066,11 +1067,11 @@ msgstr "Onion svetainÄs"
 
 #: templates/press.html:40
 msgid "Press Releases"
-msgstr ""
+msgstr "Å½iniasklaida"
 
 #: templates/press.html:54
 msgid "Coverage"
-msgstr ""
+msgstr "Sklaida"
 
 #: templates/press.html:61
 msgid "Date"
@@ -1086,7 +1087,7 @@ msgstr "Tema"
 
 #: templates/reports.html:2
 msgid "Founding Documents"
-msgstr ""
+msgstr "Ä®kÅ«rimo dokumentai"
 
 #: templates/reports.html:16
 msgid "Reports"
@@ -1122,7 +1123,7 @@ msgstr "AktyvÅ«s rÄmÄjai"
 
 #:

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

2019-10-03 Thread translation

commit bce78c65bdaf093a357ceb037e5e57058e6d96f8
Author: Translation commit bot 
Date:   Thu Oct 3 18:50:05 2019 +

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

diff --git a/contents+lt.po b/contents+lt.po
index 3e3c71f2b..0e8d2b212 100644
--- a/contents+lt.po
+++ b/contents+lt.po
@@ -1,8 +1,8 @@
 # Translators:
 # erinm, 2019
-# Tautvydas Å½., 2019
 # Moo, 2019
 # Benas Buivydas , 2019
+# Tautvydas Å½., 2019
 # 
 msgid ""
 msgstr ""
@@ -10,7 +10,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-09-05 17:40+CET\n"
 "PO-Revision-Date: 2018-11-14 12:31+\n"
-"Last-Translator: Benas Buivydas , 2019\n"
+"Last-Translator: Tautvydas Å½., 2019\n"
 "Language-Team: Lithuanian (https://www.transifex.com/otf/teams/1519/lt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -2078,15 +2078,15 @@ msgstr "Temos"
 
 #: templates/macros/topic.html:19
 msgid "Contributors to this page:"
-msgstr ""
+msgstr "Prie Å¡io puslapio prisidÄjo:"
 
 #: templates/macros/topic.html:21
 msgid "Edit this page"
-msgstr ""
+msgstr "Taisyti Å¡Ä¯ puslapÄ¯"
 
 #: templates/macros/topic.html:22
 msgid "Suggest Feedback"
-msgstr ""
+msgstr "SiÅ«lyti atsiliepimÄ"
 
 #: templates/macros/topic.html:23
 msgid "Permalink"

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

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

2019-10-03 Thread translation

commit 8bfef37f2bc3ace82287bce9b0138a8ac776e170
Author: Translation commit bot 
Date:   Thu Oct 3 17:16:48 2019 +


https://gitweb.torproject.org/translation.git/commit/?h=policies-code_of_conducttxtpot
---
 code_of_conduct+nl.po | 9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/code_of_conduct+nl.po b/code_of_conduct+nl.po
index ff4edc24e..9aecc7562 100644
--- a/code_of_conduct+nl.po
+++ b/code_of_conduct+nl.po
@@ -257,7 +257,7 @@ msgstr "Iemand in nood"
 #. type: Bullet: '- '
 #: ../code_of_conduct.txt:98
 msgid "violations of this code of conduct, even if they seem minor"
-msgstr ""
+msgstr "overtredig(en) van deze gedragscode, zelfs als ze niet ernstig lijken"
 
 #. type: Bullet: '  * '
 #: ../code_of_conduct.txt:101
@@ -269,7 +269,7 @@ msgstr ""
 #. type: Bullet: '  * '
 #: ../code_of_conduct.txt:103
 msgid "Respect the privacy of your fellow community members."
-msgstr ""
+msgstr "Respecteer de privacy van je mede gemeenschapsleden."
 
 #. type: Plain text
 #: ../code_of_conduct.txt:106
@@ -505,12 +505,13 @@ msgstr ""
 #. type: Bullet: '  - '
 #: ../code_of_conduct.txt:203
 msgid "if you have questions or concerns about the code of conduct, or"
-msgstr ""
+msgstr "als je vragen of zorgen hebt over de gedragscode, of"
 
 #. type: Bullet: '  - '
 #: ../code_of_conduct.txt:205
 msgid "if you feel that you have witnessed a code of conduct violation"
 msgstr ""
+"als je denkt getuige te zijn van een een overtreding van de gedragscode"
 
 #. type: Plain text
 #: ../code_of_conduct.txt:212
@@ -602,6 +603,8 @@ msgid ""
 "9. Scope of this document\n"
 "\n"
 msgstr ""
+"9. Domein van dit document\n"
+"\n"
 
 #. type: Plain text
 #: ../code_of_conduct.txt:258

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

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

2019-10-03 Thread translation

commit 46e4d083c28dae5cd99f3450eece34caa8bc9069
Author: Translation commit bot 
Date:   Thu Oct 3 16:46:42 2019 +

https://gitweb.torproject.org/translation.git/commit/?h=orfox-stringsxml
---
 ro/strings.xml | 10 +-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/ro/strings.xml b/ro/strings.xml
index cb5acbb4f..835787c8c 100644
--- a/ro/strings.xml
+++ b/ro/strings.xml
@@ -1,2 +1,10 @@
 
-
+OrfoxRIP
+Ãncearca Tor Browser.
+Orfox este noul Tor Browser pentru 
Android
+I-al din sursa preferatÄ:
+DU-TE PE F-DROID
+DU-TE PE GOOGLE PLAY
+DESCARCÄ .APK
+Distribuie Bookmarkurile.
+

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

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

2019-10-03 Thread translation

commit 643c014420e6cf37ea23a465414caa0b1b504745
Author: Translation commit bot 
Date:   Thu Oct 3 16:46:52 2019 +


https://gitweb.torproject.org/translation.git/commit/?h=policies-code_of_conducttxtpot
---
 code_of_conduct+nl.po | 12 
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/code_of_conduct+nl.po b/code_of_conduct+nl.po
index fec486e9e..ff4edc24e 100644
--- a/code_of_conduct+nl.po
+++ b/code_of_conduct+nl.po
@@ -7,7 +7,7 @@
 # Translators:
 # Tonnes , 2019
 # kwadronaut , 2019
-# Meteor0id, 2019
+# Meteor 0id, 2019
 # 
 #, fuzzy
 msgid ""
@@ -15,7 +15,7 @@ msgstr ""
 "Project-Id-Version: Code of conduct of the Tor Project\n"
 "POT-Creation-Date: 2019-08-02 12:00+\n"
 "PO-Revision-Date: 2019-08-27 18:54+\n"
-"Last-Translator: Meteor0id, 2019\n"
+"Last-Translator: Meteor 0id, 2019\n"
 "Language-Team: Dutch (https://www.transifex.com/otf/teams/1519/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -211,6 +211,8 @@ msgstr ""
 msgid ""
 "The following behaviors are expected and requested of all community members:"
 msgstr ""
+"De volgende gedragingen worden verwacht en gevraagd van alle leden van de "
+"gemeenschap:"
 
 #. type: Bullet: '  * '
 #: ../code_of_conduct.txt:83
@@ -318,7 +320,7 @@ msgstr ""
 #. type: Bullet: '  * '
 #: ../code_of_conduct.txt:127
 msgid "Personal insults or attacks, particularly those related to:"
-msgstr ""
+msgstr "Persoonlijke beledigingen of aanvallen, met name die gerelateerd aan:"
 
 #. type: Bullet: '- '
 #: ../code_of_conduct.txt:129
@@ -605,6 +607,7 @@ msgstr ""
 #: ../code_of_conduct.txt:258
 msgid "This code of conduct covers all community participants:"
 msgstr ""
+"Deze gedragscode heeft betrekking tot alle deelnemers van de gemeenschap:"
 
 #. type: Bullet: '  - '
 #: ../code_of_conduct.txt:260
@@ -629,12 +632,13 @@ msgstr ""
 #. type: Bullet: '  - '
 #: ../code_of_conduct.txt:268
 msgid "in all online and in-person community venues"
-msgstr ""
+msgstr "in alle on-line en in-persoon gemeenschapsactiviteiten"
 
 #. type: Bullet: '  - '
 #: ../code_of_conduct.txt:270
 msgid "in one-on-one communications that relate to community work"
 msgstr ""
+"in Ã©Ã©n-op-Ã©Ã©n-communicaties welke gerelateerd zijn aan gemeenschapswerk"
 
 #. type: Plain text
 #: ../code_of_conduct.txt:277

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

[tor-commits] [tor/master] Light edits on 0.4.2.2-alpha changelog.

2019-10-03 Thread nickm

commit db976cd9277199664f7b55e2f9b105f6e96174c6
Author: Nick Mathewson 
Date:   Thu Oct 3 12:34:21 2019 -0400

Light edits on 0.4.2.2-alpha changelog.
---
 ChangeLog | 17 -
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6f1e09dd2..bddac3825 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 Changes in version 0.4.2.2-alpha - 2019-10-0?
-  This release fixes several bugs from the previous alpha release.
+  This release fixes several bugs from the previous alpha release, and
+  from earlier versions. It also includes a change in authorities, so
+  that they begin to reject the currently unsupported release series.
 
   o Major features (directory authorities):
 - Directory authorities now reject relays running all currently
@@ -14,7 +16,7 @@ Changes in version 0.4.2.2-alpha - 2019-10-0?
   o Major bugfixes (torrc parsing):
 - Stop ignoring torrc options after an %include directive, when the
   included directory ends with a file that does not contain any
-  config options. (But does contain comments or whitespace.) Fixes
+  config options (but does contain comments or whitespace). Fixes
   bug 31408; bugfix on 0.3.1.1-alpha.
 
   o Minor features (auto-formatting scripts):
@@ -24,19 +26,16 @@ Changes in version 0.4.2.2-alpha - 2019-10-0?
   Closes ticket 31779.
 
   o Minor features (continuous integration):
-- When building on Appveyor, pass the "-k" flag to make, so that we
-  are informed of all compilation failures, not just the first one
-  or two. Closes part of ticket 31372.
-- When building on Travis, pass the "-k" flag to make, so that we
-  are informed of all compilation failures, not just the first one
-  or two. Closes part of ticket 31372.
+- When building on Appveyor and Travis, pass the "-k" flag to make,
+  so that we are informed of all compilation failures, not just the
+  first one or two. Closes ticket 31372.
 
   o Minor features (geoip):
 - Update geoip and geoip6 to the October 1 2019 Maxmind GeoLite2
   Country database. Closes ticket 31931.
 
   o Minor features (maintenance scripts):
-- Add a coccinelle script to detect bugs caused by incrementing or
+- Add a Coccinelle script to detect bugs caused by incrementing or
   decrementing a variable inside a call to log_debug(). Since
   log_debug() is a macro whose arguments are conditionally
   evaluated, it is usually an error to do this. One such bug was

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

[tor-commits] [tor/master] lightly sort changelog entries

2019-10-03 Thread nickm

commit 5ae1a574dc11035fcea915948943c9a0a2082eae
Author: Nick Mathewson 
Date:   Thu Oct 3 12:24:47 2019 -0400

lightly sort changelog entries
---
 ChangeLog | 20 +---
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 915509cfa..6f1e09dd2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,22 +1,22 @@
 Changes in version 0.4.2.2-alpha - 2019-10-0?
   This release fixes several bugs from the previous alpha release.
 
+  o Major features (directory authorities):
+- Directory authorities now reject relays running all currently
+  deprecated release series. The currently supported release series
+  are: 0.2.9, 0.3.5, 0.4.0, 0.4.1, and 0.4.2. Closes ticket 31549.
+
   o Major bugfixes (embedded Tor):
 - Avoid a possible crash when restarting Tor in embedded mode and
   enabling a different set of publish/subscribe messages. Fixes bug
   31898; bugfix on 0.4.1.1-alpha.
 
-  o Major bugfixes (torrc):
+  o Major bugfixes (torrc parsing):
 - Stop ignoring torrc options after an %include directive, when the
   included directory ends with a file that does not contain any
   config options. (But does contain comments or whitespace.) Fixes
   bug 31408; bugfix on 0.3.1.1-alpha.
 
-  o Minor features (authority):
-- Directory authorities now reject relays running all currently
-  deprecated release series. The currently supported release series
-  are: 0.2.9, 0.3.5, 0.4.0, 0.4.1, and 0.4.2. Closes ticket 31549.
-
   o Minor features (auto-formatting scripts):
 - When annotating C macros, never generate a line that our check-
   spaces script would reject. Closes ticket 31759.
@@ -48,7 +48,7 @@ Changes in version 0.4.2.2-alpha - 2019-10-0?
   services by pointing them to the right documentation. Closes
   ticket 28966.
 
-  o Minor bugfixes (Appveyor CI):
+  o Minor bugfixes (Appveyor continuous integration):
 - Avoid spurious errors when Appveyor CI fails before the install
   step. Fixes bug 31884; bugfix on 0.3.4.2-alpha.
 
@@ -105,6 +105,8 @@ Changes in version 0.4.2.2-alpha - 2019-10-0?
 - Use SEVERITY_MASK_IDX() to find the LOG_* mask indexes in the unit
   tests and fuzzers, rather than using hard-coded values. Closes
   ticket 31334.
+- Interface for function `decrypt_desc_layer` cleaned up. Closes
+  ticket 31589.
 
   o Documentation:
 - Document the signal-safe logging behaviour in the tor man page.
@@ -117,10 +119,6 @@ Changes in version 0.4.2.2-alpha - 2019-10-0?
   This is based on the old "tor-guts.git" repository, which we are
   adopting and superseding. Closes ticket 31849.
 
-  o Code simplification and refactoring (onion services):
-- Interface for function `decrypt_desc_layer` cleaned up. Closes
-  ticket 31589.
-
 
 Changes in version 0.4.1.6 - 2019-09-19
   This release backports several bugfixes to improve stability and



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

[tor-commits] [tor/master] Run format_changelog

2019-10-03 Thread nickm

commit 0ef59dd09bd51d2fab37246668c94646bf8df6f5
Author: Nick Mathewson 
Date:   Thu Oct 3 12:23:05 2019 -0400

Run format_changelog
---
 ChangeLog | 112 --
 1 file changed, 57 insertions(+), 55 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f69bc8c39..915509cfa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,28 +8,28 @@ Changes in version 0.4.2.2-alpha - 2019-10-0?
 
   o Major bugfixes (torrc):
 - Stop ignoring torrc options after an %include directive, when the
-  included directory ends with a file that does not contain any config
-  options. (But does contain comments or whitespace.)
-  Fixes bug 31408; bugfix on 0.3.1.1-alpha.
+  included directory ends with a file that does not contain any
+  config options. (But does contain comments or whitespace.) Fixes
+  bug 31408; bugfix on 0.3.1.1-alpha.
 
   o Minor features (authority):
 - Directory authorities now reject relays running all currently
-  deprecated release series.  The currently supported release series
-  are: 0.2.9, 0.3.5, 0.4.0, 0.4.1, and 0.4.2.  Closes ticket 31549.
+  deprecated release series. The currently supported release series
+  are: 0.2.9, 0.3.5, 0.4.0, 0.4.1, and 0.4.2. Closes ticket 31549.
 
   o Minor features (auto-formatting scripts):
-- When annotating C macros, never generate a line that our check-spaces
-  script would reject. Closes ticket 31759.
+- When annotating C macros, never generate a line that our check-
+  spaces script would reject. Closes ticket 31759.
 - When annotating C macros, try to remove cases of double-negation.
   Closes ticket 31779.
 
   o Minor features (continuous integration):
-- When building on Appveyor, pass the "-k" flag to make, so that
-  we are informed of all compilation failures, not just the first
-  one or two. Closes part of ticket 31372.
-- When building on Travis, pass the "-k" flag to make, so that
-  we are informed of all compilation failures, not just the first
-  one or two. Closes part of ticket 31372.
+- When building on Appveyor, pass the "-k" flag to make, so that we
+  are informed of all compilation failures, not just the first one
+  or two. Closes part of ticket 31372.
+- When building on Travis, pass the "-k" flag to make, so that we
+  are informed of all compilation failures, not just the first one
+  or two. Closes part of ticket 31372.
 
   o Minor features (geoip):
 - Update geoip and geoip6 to the October 1 2019 Maxmind GeoLite2
@@ -37,40 +37,40 @@ Changes in version 0.4.2.2-alpha - 2019-10-0?
 
   o Minor features (maintenance scripts):
 - Add a coccinelle script to detect bugs caused by incrementing or
-  decrementing a variable inside a call to log_debug().  Since
-  log_debug() is a macro whose arguments are conditionally evaluated, it
-  is usually an error to do this. One such bug was 30628, in which SENDME
-  cells were miscounted by a decrement operator inside a log_debug()
-  call.  Closes ticket 30743.
+  decrementing a variable inside a call to log_debug(). Since
+  log_debug() is a macro whose arguments are conditionally
+  evaluated, it is usually an error to do this. One such bug was
+  30628, in which SENDME cells were miscounted by a decrement
+  operator inside a log_debug() call. Closes ticket 30743.
 
   o Minor features (onion services v3):
 - Assist users who try to setup v2 client authorization in v3 onion
-  services by pointing them to the right documentation. Closes ticket
-  28966.
+  services by pointing them to the right documentation. Closes
+  ticket 28966.
 
   o Minor bugfixes (Appveyor CI):
-- Avoid spurious errors when Appveyor CI fails before the install step.
-  Fixes bug 31884; bugfix on 0.3.4.2-alpha.
+- Avoid spurious errors when Appveyor CI fails before the install
+  step. Fixes bug 31884; bugfix on 0.3.4.2-alpha.
 
   o Minor bugfixes (best practices tracker):
-- When listing overbroad exceptions, do not also list problems,
-  and do not list insufficiently broad exceptions. Fixes bug 31338;
+- When listing overbroad exceptions, do not also list problems, and
+  do not list insufficiently broad exceptions. Fixes bug 31338;
   bugfix on 0.4.2.1-alpha.
 
   o Minor bugfixes (controller protocol):
 - Fix the MAPADDRESS controller command to accept one or more
-  arguments. Previously, it required two or more arguments, and ignored
-  the first. Fixes bug 31772; bugfix on 0.4.1.1-alpha.
+  arguments. Previously, it required two or more arguments, and
+  ignored the first. Fixes bug 31772; bugfix on 0.4.1.1-alpha.
 
   o Minor bugfixes (logging):
-- Add a missing check for HAVE_PTHREAD_H, because the backtrace code uses
-  mutexes. Fixes bug 31614; bugfix on 0.2.5.2-alpha.
-- Disable backtrace signal

[tor-commits] [tor/master] Sort changes entries into a changelog for 0.4.2.2-alpha

2019-10-03 Thread nickm

commit 519afb0ece2485eb20450d0508637cf5632ce75d
Author: Nick Mathewson 
Date:   Thu Oct 3 12:22:46 2019 -0400

Sort changes entries into a changelog for 0.4.2.2-alpha
---
 ChangeLog| 122 +++
 changes/bug28966 |   4 --
 changes/bug30916 |   4 --
 changes/bug31107 |   4 --
 changes/bug31334 |   4 --
 changes/bug31408 |   5 --
 changes/bug31614 |   9 
 changes/bug31736 |   3 --
 changes/bug31825 |   3 --
 changes/bug31854 |   3 --
 changes/bug31884 |   3 --
 changes/bug31897 |   3 --
 changes/bug31898 |   4 --
 changes/geoip-2019-10-01 |   4 --
 changes/ticket30743  |   7 ---
 changes/ticket31338  |   4 --
 changes/ticket31372_appveyor |   4 --
 changes/ticket31372_travis   |   4 --
 changes/ticket31466  |   5 --
 changes/ticket31549  |   4 --
 changes/ticket31589  |   2 -
 changes/ticket31675  |   3 --
 changes/ticket31759  |   5 --
 changes/ticket31772  |   4 --
 changes/ticket31839  |   3 --
 changes/ticket31840  |   3 --
 changes/ticket31849  |   5 --
 27 files changed, 122 insertions(+), 106 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 938e91545..f69bc8c39 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,125 @@
+Changes in version 0.4.2.2-alpha - 2019-10-0?
+  This release fixes several bugs from the previous alpha release.
+
+  o Major bugfixes (embedded Tor):
+- Avoid a possible crash when restarting Tor in embedded mode and
+  enabling a different set of publish/subscribe messages. Fixes bug
+  31898; bugfix on 0.4.1.1-alpha.
+
+  o Major bugfixes (torrc):
+- Stop ignoring torrc options after an %include directive, when the
+  included directory ends with a file that does not contain any config
+  options. (But does contain comments or whitespace.)
+  Fixes bug 31408; bugfix on 0.3.1.1-alpha.
+
+  o Minor features (authority):
+- Directory authorities now reject relays running all currently
+  deprecated release series.  The currently supported release series
+  are: 0.2.9, 0.3.5, 0.4.0, 0.4.1, and 0.4.2.  Closes ticket 31549.
+
+  o Minor features (auto-formatting scripts):
+- When annotating C macros, never generate a line that our check-spaces
+  script would reject. Closes ticket 31759.
+- When annotating C macros, try to remove cases of double-negation.
+  Closes ticket 31779.
+
+  o Minor features (continuous integration):
+- When building on Appveyor, pass the "-k" flag to make, so that
+  we are informed of all compilation failures, not just the first
+  one or two. Closes part of ticket 31372.
+- When building on Travis, pass the "-k" flag to make, so that
+  we are informed of all compilation failures, not just the first
+  one or two. Closes part of ticket 31372.
+
+  o Minor features (geoip):
+- Update geoip and geoip6 to the October 1 2019 Maxmind GeoLite2
+  Country database. Closes ticket 31931.
+
+  o Minor features (maintenance scripts):
+- Add a coccinelle script to detect bugs caused by incrementing or
+  decrementing a variable inside a call to log_debug().  Since
+  log_debug() is a macro whose arguments are conditionally evaluated, it
+  is usually an error to do this. One such bug was 30628, in which SENDME
+  cells were miscounted by a decrement operator inside a log_debug()
+  call.  Closes ticket 30743.
+
+  o Minor features (onion services v3):
+- Assist users who try to setup v2 client authorization in v3 onion
+  services by pointing them to the right documentation. Closes ticket
+  28966.
+
+  o Minor bugfixes (Appveyor CI):
+- Avoid spurious errors when Appveyor CI fails before the install step.
+  Fixes bug 31884; bugfix on 0.3.4.2-alpha.
+
+  o Minor bugfixes (best practices tracker):
+- When listing overbroad exceptions, do not also list problems,
+  and do not list insufficiently broad exceptions. Fixes bug 31338;
+  bugfix on 0.4.2.1-alpha.
+
+  o Minor bugfixes (controller protocol):
+- Fix the MAPADDRESS controller command to accept one or more
+  arguments. Previously, it required two or more arguments, and ignored
+  the first. Fixes bug 31772; bugfix on 0.4.1.1-alpha.
+
+  o Minor bugfixes (logging):
+- Add a missing check for HAVE_PTHREAD_H, because the backtrace code uses
+  mutexes. Fixes bug 31614; bugfix on 0.2.5.2-alpha.
+- Disable backtrace signal handlers when shutting down tor.
+  Fixes bug 31614; bugfix on 0.2.5.2-alpha.
+- Rate-limit our the logging message about the obsolete .exit notation.
+  Previously, there was no limit on this warning, which could potentially
+  be triggered many times by a hostile website. Fixes bug 31466;
+  bugfix on

[tor-commits] [tor/master] Merge branch 'tor-github/pr/1377'

2019-10-03 Thread asn

commit 9309eaf8ead0058aed6f1399b63fc8ae54cef799
Merge: 3778b97ca db329522e
Author: George Kadianakis 
Date:   Thu Oct 3 19:13:57 2019 +0300

Merge branch 'tor-github/pr/1377'

 changes/bug31854|  3 +++
 src/lib/log/log.c   | 22 --
 src/lib/log/log.h   | 13 -
 src/test/test_options.c |  6 +++---
 4 files changed, 30 insertions(+), 14 deletions(-)

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

[tor-commits] [tor/master] log: When initialising log domain masks, only set known log domains

2019-10-03 Thread asn

commit db329522ef6f0d097cbd07f35d54e0c7eced
Author: teor 
Date:   Thu Sep 26 13:37:06 2019 +1000

log: When initialising log domain masks, only set known log domains

And add a runtime test that checks for unknown domains and flags.

Fixes bug 31854; bugfix on 0.2.1.1-alpha.
---
 changes/bug31854|  3 +++
 src/lib/log/log.c   | 12 
 src/test/test_options.c |  6 +++---
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/changes/bug31854 b/changes/bug31854
new file mode 100644
index 0..692a192fd
--- /dev/null
+++ b/changes/bug31854
@@ -0,0 +1,3 @@
+  o Minor bugfixes (logging):
+- When initialising log domain masks, only set known log domains.
+  Fixes bug 31854; bugfix on 0.2.1.1-alpha.
diff --git a/src/lib/log/log.c b/src/lib/log/log.c
index db4f15441..7c18bea0d 100644
--- a/src/lib/log/log.c
+++ b/src/lib/log/log.c
@@ -628,6 +628,10 @@ void
 tor_log(int severity, log_domain_mask_t domain, const char *format, ...)
 {
   va_list ap;
+
+  /* check that domain is composed of known domains and flags */
+  raw_assert((domain & (LD_ALL_DOMAINS|LD_ALL_FLAGS)) == domain);
+
   if (severity > log_global_min_severity_)
 return;
   va_start(ap,format);
@@ -927,7 +931,7 @@ set_log_severity_config(int loglevelMin, int loglevelMax,
   raw_assert(loglevelMax >= LOG_ERR && loglevelMax <= LOG_DEBUG);
   memset(severity_out, 0, sizeof(log_severity_list_t));
   for (i = loglevelMin; i >= loglevelMax; --i) {
-severity_out->masks[SEVERITY_MASK_IDX(i)] = ~0u;
+severity_out->masks[SEVERITY_MASK_IDX(i)] = LD_ALL_DOMAINS;
   }
 }
 
@@ -1421,7 +1425,7 @@ parse_log_severity_config(const char **cfg_ptr,
 const char *dash, *space;
 char *sev_lo, *sev_hi;
 int low, high, i;
-log_domain_mask_t domains = ~0u;
+log_domain_mask_t domains = LD_ALL_DOMAINS;
 
 if (*cfg == '[') {
   int err = 0;
@@ -1439,7 +1443,7 @@ parse_log_severity_config(const char **cfg_ptr,
   tor_free(domains_str);
   SMARTLIST_FOREACH_BEGIN(domains_list, const char *, domain) {
 if (!strcmp(domain, "*")) {
-  domains = ~0u;
+  domains = LD_ALL_DOMAINS;
 } else {
   log_domain_mask_t d;
   int negate=0;
@@ -1535,7 +1539,7 @@ switch_logs_debug(void)
   LOCK_LOGS();
   for (lf = logfiles; lf; lf=lf->next) {
 for (i = LOG_DEBUG; i >= LOG_ERR; --i)
-  lf->severities->masks[SEVERITY_MASK_IDX(i)] = ~0u;
+  lf->severities->masks[SEVERITY_MASK_IDX(i)] = LD_ALL_DOMAINS;
   }
   log_global_min_severity_ = get_min_log_level();
   UNLOCK_LOGS();
diff --git a/src/test/test_options.c b/src/test/test_options.c
index b3654ede7..9eb5a4392 100644
--- a/src/test/test_options.c
+++ b/src/test/test_options.c
@@ -54,9 +54,9 @@ setup_log_callback(void)
 {
   log_severity_list_t lst;
   memset(, 0, sizeof(lst));
-  lst.masks[SEVERITY_MASK_IDX(LOG_ERR)] = ~0;
-  lst.masks[SEVERITY_MASK_IDX(LOG_WARN)] = ~0;
-  lst.masks[SEVERITY_MASK_IDX(LOG_NOTICE)] = ~0;
+  lst.masks[SEVERITY_MASK_IDX(LOG_ERR)] = LD_ALL_DOMAINS;
+  lst.masks[SEVERITY_MASK_IDX(LOG_WARN)] = LD_ALL_DOMAINS;
+  lst.masks[SEVERITY_MASK_IDX(LOG_NOTICE)] = LD_ALL_DOMAINS;
   add_callback_log(, log_cback);
   mark_logs_temp();
 }



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

[tor-commits] [tor/master] log: Remove duplicate code and an outdated comment

2019-10-03 Thread asn

commit 4c88ebcf4728084cad0a1f177eb9cdb107388581
Author: teor 
Date:   Thu Sep 26 13:31:32 2019 +1000

log: Remove duplicate code and an outdated comment

Preparation for 31854.
---
 src/lib/log/log.c | 6 +-
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/lib/log/log.c b/src/lib/log/log.c
index d2002f6ea..994fdbdd9 100644
--- a/src/lib/log/log.c
+++ b/src/lib/log/log.c
@@ -584,8 +584,7 @@ logv,(int severity, log_domain_mask_t domain, const char 
*funcname,
   /* check that severity is sane.  Overrunning the masks array leads to
* interesting and hard to diagnose effects */
   raw_assert(severity >= LOG_ERR && severity <= LOG_DEBUG);
-  /* check that we've initialised the log mutex before we try to lock it */
-  raw_assert(log_mutex_initialized);
+
   LOCK_LOGS();
 
   if ((! (domain & LD_NOCB)) && pending_cb_messages
@@ -866,9 +865,6 @@ logs_close_sigsafe(void)
  * logfiles (it is probably present, but it might not be due to thread
  * racing issues). After this function is called, the caller shouldn't
  * refer to victim anymore.
- *
- * Long-term, we need to do something about races in the log subsystem
- * in general. See bug 222 for more details.
  */
 static void
 delete_log(logfile_t *victim)



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

[tor-commits] [tor/master] log: Define count, boundary, and all macros for domains and flags

2019-10-03 Thread asn

commit 25c5322dfe228178391b37fffdabdf57baa5
Author: teor 
Date:   Thu Sep 26 13:33:17 2019 +1000

log: Define count, boundary, and all macros for domains and flags

And do static checks on those macro definitions.

Part of 31854.
---
 src/lib/log/log.c |  4 +++-
 src/lib/log/log.h | 13 -
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/lib/log/log.c b/src/lib/log/log.c
index 994fdbdd9..db4f15441 100644
--- a/src/lib/log/log.c
+++ b/src/lib/log/log.c
@@ -1337,7 +1337,9 @@ static const char *domain_list[] = {
 
 CTASSERT(ARRAY_LENGTH(domain_list) == N_LOGGING_DOMAINS + 1);
 
-CTASSERT((UINT64_C(1)<<(N_LOGGING_DOMAINS-1)) < LOWEST_RESERVED_LD_FLAG_);
+CTASSERT(HIGHEST_RESERVED_LD_DOMAIN_ < LD_ALL_DOMAINS);
+CTASSERT(LD_ALL_DOMAINS < LOWEST_RESERVED_LD_FLAG_);
+CTASSERT(LOWEST_RESERVED_LD_FLAG_ < LD_ALL_FLAGS);
 
 /** Return a bitmask for the log domain for which domain is the name,
  * or 0 if there is no such name. */
diff --git a/src/lib/log/log.h b/src/lib/log/log.h
index da4bcbe60..b957fd156 100644
--- a/src/lib/log/log.h
+++ b/src/lib/log/log.h
@@ -117,10 +117,21 @@
 #define LD_BTRACK(UINT64_C(1)<<28)
 /** Message-passing backend. */
 #define LD_MESG  (UINT64_C(1)<<29)
+
+/** The number of log domains. */
 #define N_LOGGING_DOMAINS 30
+/** The highest log domain */
+#define HIGHEST_RESERVED_LD_DOMAIN_ (UINT64_C(1)<<(N_LOGGING_DOMAINS - 1))
+/** All log domains. */
+#define LD_ALL_DOMAINS ((~(UINT64_C(0)))>>(64 - N_LOGGING_DOMAINS))
 
+/** The number of log flags. */
+#define N_LOGGING_FLAGS 3
 /** First bit that is reserved in log_domain_mask_t for non-domain flags. */
-#define LOWEST_RESERVED_LD_FLAG_ (UINT64_C(1)<<61)
+#define LOWEST_RESERVED_LD_FLAG_ (UINT64_C(1)<<(64 - N_LOGGING_FLAGS))
+/** All log flags. */
+#define LD_ALL_FLAGS ((~(UINT64_C(0)))<<(64 - N_LOGGING_FLAGS))
+
 #ifdef TOR_UNIT_TESTS
 /** This log message should not be intercepted by mock_saving_logv */
 #define LD_NO_MOCK (UINT64_C(1)<<61)



___
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 'tor-github/pr/1276'

2019-10-03 Thread asn

commit 3778b97cabbf6f89694884c5f6b42dccb488df7f
Merge: 065e467e7 49d6990ca
Author: George Kadianakis 
Date:   Thu Oct 3 19:13:02 2019 +0300

Merge branch 'tor-github/pr/1276'

 changes/ticket31549 |  4 +++
 src/feature/dirauth/process_descs.c | 59 +++-
 src/feature/dirauth/process_descs.h |  2 ++
 src/test/include.am |  1 +
 src/test/test.c |  1 +
 src/test/test.h |  1 +
 src/test/test_process_descs.c   | 67 +
 7 files changed, 119 insertions(+), 16 deletions(-)

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

[tor-commits] [tor/master] Unit tests for dirserv_reject_tor_version().

2019-10-03 Thread asn

commit 49d6990cae0f6e7e636e320d0efcaec31b3c0453
Author: Nick Mathewson 
Date:   Thu Aug 29 11:45:41 2019 -0400

Unit tests for dirserv_reject_tor_version().
---
 src/test/include.am   |  1 +
 src/test/test.c   |  1 +
 src/test/test.h   |  1 +
 src/test/test_process_descs.c | 67 +++
 4 files changed, 70 insertions(+)

diff --git a/src/test/include.am b/src/test/include.am
index 1e20f3f53..101e915cf 100644
--- a/src/test/include.am
+++ b/src/test/include.am
@@ -175,6 +175,7 @@ src_test_test_SOURCES += \
src/test/test_periodic_event.c \
src/test/test_policy.c \
src/test/test_process.c \
+   src/test/test_process_descs.c \
src/test/test_prob_distr.c \
src/test/test_procmon.c \
src/test/test_proto_http.c \
diff --git a/src/test/test.c b/src/test/test.c
index b9a1da06f..5f27f994f 100644
--- a/src/test/test.c
+++ b/src/test/test.c
@@ -858,6 +858,7 @@ struct testgroup_t testgroups[] = {
   { "crypto/pem/", pem_tests },
   { "crypto/rng/", crypto_rng_tests },
   { "dir/", dir_tests },
+  { "dir/auth/process_descs/", process_descs_tests },
   { "dir/md/", microdesc_tests },
   { "dir/voting/flags/", voting_flags_tests },
   { "dir/voting/schedule/", voting_schedule_tests },
diff --git a/src/test/test.h b/src/test/test.h
index f5c21bfe8..d0b045a80 100644
--- a/src/test/test.h
+++ b/src/test/test.h
@@ -252,6 +252,7 @@ extern struct testcase_t prob_distr_tests[];
 extern struct testcase_t slow_stochastic_prob_distr_tests[];
 extern struct testcase_t procmon_tests[];
 extern struct testcase_t process_tests[];
+extern struct testcase_t process_descs_tests[];
 extern struct testcase_t proto_http_tests[];
 extern struct testcase_t proto_misc_tests[];
 extern struct testcase_t protover_tests[];
diff --git a/src/test/test_process_descs.c b/src/test/test_process_descs.c
new file mode 100644
index 0..7dc9abde3
--- /dev/null
+++ b/src/test/test_process_descs.c
@@ -0,0 +1,67 @@
+/* Copyright (c) 2019, The Tor Project, Inc. */
+/* See LICENSE for licensing information */
+
+#include "orconfig.h"
+
+#include "core/or/or.h"
+#include "feature/dirauth/process_descs.h"
+
+#include "test/test.h"
+
+static void
+test_process_descs_versions(void *arg)
+{
+  (void)arg;
+  struct {
+const char *version;
+bool should_reject;
+  } cases[] = {
+// a very old version: reject.
+{ "Tor 0.1.2.3-alpha", true },
+// a non-tor program: don't reject.
+{ "Wombat 0.1.2.3-alpha", false },
+// a slightly old version: reject
+{ "Tor 0.2.9.4-alpha", true },
+// a slightly old version: just new enough to support.
+{ "Tor 0.2.9.5-alpha", false },
+// a newer 0.2.9 version: supported.
+{ "Tor 0.2.9.100", false },
+// some unsupported versions: reject.
+{ "Tor 0.3.0.0-alpha-dev", true },
+{ "Tor 0.3.0.2-alpha", true },
+{ "Tor 0.3.0.5", true },
+{ "Tor 0.3.1.4", true },
+{ "Tor 0.3.2.4", true },
+{ "Tor 0.3.3.4", true },
+{ "Tor 0.3.4.1-alpha", true },
+{ "Tor 0.3.4.100", true },
+{ "Tor 0.3.5.1-alpha", true },
+{ "Tor 0.3.5.6-rc", true},
+// new enough to be supported
+{ "Tor 0.3.5.7", false },
+{ "Tor 0.3.5.8", false },
+{ "Tor 0.4.0.1-alpha", false },
+{ "Tor 0.4.1.5", false },
+// Very far in the future
+{ "Tor 100.100.1.5", false },
+  };
+  size_t n_cases = ARRAY_LENGTH(cases);
+
+  for (unsigned i = 0; i < n_cases; ++i) {
+const char *msg = NULL;
+bool rejected = dirserv_rejects_tor_version(cases[i].version, );
+tt_int_op(rejected, OP_EQ, cases[i].should_reject);
+tt_int_op(msg == NULL, OP_EQ, rejected == false);
+  }
+
+ done:
+  ;
+}
+
+#define T(name,flags)   \
+  { #name, test_process_descs_##name, (flags), NULL, NULL }
+
+struct testcase_t process_descs_tests[] = {
+  T(versions,0),
+  END_OF_TESTCASES
+};



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

[tor-commits] [tor/master] Authorities reject relays running unsupported Tor release series.

2019-10-03 Thread asn

commit 4d4e2abd2f961e735b9b8d93e9e09695515b8ac8
Author: Nick Mathewson 
Date:   Thu Aug 29 11:43:43 2019 -0400

Authorities reject relays running unsupported Tor release series.

Our minimum version is now 0.2.9.5-alpha.  Series 0.3.0, 0.3.1,
0.3.2, 0.3.3, and 0.3.4 are now rejected.

Also, extract this version-checking code into a new function, so we
can test it.

Closes ticket 31549.

Also reject 0.3.5.0 through 0.3.5.6-rc as unstable.
---
 changes/ticket31549 |  4 +++
 src/feature/dirauth/process_descs.c | 59 +++--
 src/feature/dirauth/process_descs.h |  2 ++
 3 files changed, 49 insertions(+), 16 deletions(-)

diff --git a/changes/ticket31549 b/changes/ticket31549
new file mode 100644
index 0..2c27aca4f
--- /dev/null
+++ b/changes/ticket31549
@@ -0,0 +1,4 @@
+  o Minor features (authority):
+- Directory authorities now reject relays running all currently
+  deprecated release series.  The currently supported release series
+  are: 0.2.9, 0.3.5, 0.4.0, 0.4.1, and 0.4.2.  Closes ticket 31549.
diff --git a/src/feature/dirauth/process_descs.c 
b/src/feature/dirauth/process_descs.c
index e1a02179b..74a2cde1b 100644
--- a/src/feature/dirauth/process_descs.c
+++ b/src/feature/dirauth/process_descs.c
@@ -315,6 +315,47 @@ dirserv_would_reject_router(const routerstatus_t *rs)
   return (res & FP_REJECT) != 0;
 }
 
+/**
+ * Check whether the platform string in platform describes a platform
+ * that, as a directory authority, we want to reject.  If it does, return
+ * true, and set *msg (if present) to a rejection message.  Otherwise
+ * return false.
+ */
+STATIC bool
+dirserv_rejects_tor_version(const char *platform,
+const char **msg)
+{
+  if (!platform)
+return false;
+
+  static const char please_upgrade_string[] =
+"Tor version is insecure or unsupported. Please upgrade!";
+
+  /* Versions before Tor 0.2.9 are unsupported. Versions between 0.2.9.0 and
+   * 0.2.9.4 suffer from bug #20499, where relays don't keep their consensus
+   * up to date */
+  if (!tor_version_as_new_as(platform,"0.2.9.5-alpha")) {
+if (msg)
+  *msg = please_upgrade_string;
+return true;
+  }
+
+  /* Series between Tor 0.3.0 and 0.3.4 inclusive are unsupported, and some
+   * have bug #27841, which makes them broken as intro points. Reject them.
+   *
+   * Also reject unstable versions of 0.3.5, since (as of this writing)
+   * they are almost none of the network. */
+  if (tor_version_as_new_as(platform,"0.3.0.0-alpha-dev") &&
+  !tor_version_as_new_as(platform,"0.3.5.7")) {
+if (msg) {
+  *msg = please_upgrade_string;
+}
+return true;
+  }
+
+  return false;
+}
+
 /** Helper: As dirserv_router_get_status, but takes the router fingerprint
  * (hex, no spaces), nickname, address (used for logging only), IP address, OR
  * port and platform (logging only) as arguments.
@@ -347,22 +388,8 @@ dirserv_get_status_impl(const char *id_digest, const char 
*nickname,
 }
   }
 
-  /* Versions before Tor 0.2.4.18-rc are too old to support, and are
-   * missing some important security fixes too. Disable them. */
-  if (platform && !tor_version_as_new_as(platform,"0.2.4.18-rc")) {
-if (msg)
-  *msg = "Tor version is insecure or unsupported. Please upgrade!";
-return FP_REJECT;
-  }
-
-  /* Tor 0.2.9.x where x<5 suffers from bug #20499, where relays don't
-   * keep their consensus up to date so they make bad guards.
-   * The simple fix is to just drop them from the network. */
-  if (platform &&
-  tor_version_as_new_as(platform,"0.2.9.0-alpha") &&
-  !tor_version_as_new_as(platform,"0.2.9.5-alpha")) {
-if (msg)
-  *msg = "Tor version contains bug 20499. Please upgrade!";
+  /* Check whether the version is obsolete, broken, insecure, etc... */
+  if (platform && dirserv_rejects_tor_version(platform, msg)) {
 return FP_REJECT;
   }
 
diff --git a/src/feature/dirauth/process_descs.h 
b/src/feature/dirauth/process_descs.h
index 1d4085b09..0203cebfa 100644
--- a/src/feature/dirauth/process_descs.h
+++ b/src/feature/dirauth/process_descs.h
@@ -38,6 +38,8 @@ int dirserv_would_reject_router(const routerstatus_t *rs);
 
 #ifdef TOR_UNIT_TESTS
 STATIC int dirserv_router_has_valid_address(routerinfo_t *ri);
+STATIC bool dirserv_rejects_tor_version(const char *platform,
+const char **msg);
 #endif /* defined(TOR_UNIT_TESTS) */
 
 #endif /* !defined(TOR_RECV_UPLOADS_H) */



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

[tor-commits] [tor/master] bump to 0.4.2.2-alpha

2019-10-03 Thread nickm

commit 065e467e7cc78f25469f467d741c2d379fbbc246
Author: Nick Mathewson 
Date:   Thu Oct 3 12:07:50 2019 -0400

bump to 0.4.2.2-alpha
---
 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 bd12e6167..e623b33ad 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.1-alpha-dev])
+AC_INIT([tor],[0.4.2.2-alpha])
 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, ["2019-09-17"], # for 0.4.2.1-alpha-dev
+AC_DEFINE(APPROX_RELEASE_DATE, ["2019-10-03"], # for 0.4.2.2-alpha
   [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 26387b03f..bdd112a08 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.1-alpha-dev"
+!define VERSION "0.4.2.2-alpha"
 !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 ac0513bc6..6bcd18ef6 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.1-alpha-dev"
+#define VERSION "0.4.2.2-alpha"
 
 
 

___
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

2019-10-03 Thread translation

commit 712cf3dad1156dd02321780657fb867eb40de13f
Author: Translation commit bot 
Date:   Thu Oct 3 15:53:03 2019 +

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

diff --git a/contents+zh-CN.po b/contents+zh-CN.po
index 9810536c1..e0ab0225e 100644
--- a/contents+zh-CN.po
+++ b/contents+zh-CN.po
@@ -207,7 +207,7 @@ msgstr "å¼ºçå»ºè®®ä¸è¦å¨ Tor æµè§å¨ä¸å®è£
æ°çéå ç»ä»¶ï¼å ä¸º
 msgid ""
 "Installing new add-ons may affect Tor Browser in unforeseen ways and "
 "potentially make your Tor Browser fingerprint unique."
-msgstr ""
+msgstr "å®è£æ°çæå±å¯è½ä¼æå¤å½±åTor 
æµè§å¨ï¼å¹¶ä½¿å¾æ¨çTor æµè§å¨çæµè§å¨æçº¹åå¾ç¬ä¸æ äºã"
 
 #: https//support.torproject.org/faq/faq-3/
 #: (content/faq/faq-3/contents+en.lrquestion.description)
@@ -235,7 +235,7 @@ msgstr 
"ç®åæ¥è¯´ï¼æææµè§å¨çè®¾ç½®ä¸ç¹æ§é½ä¼åé ä¸ä¸ªå«â
 msgid ""
 "Most browsers inadvertently create a unique fingerprint for each user which "
 "can be tracked across the internet."
-msgstr ""
+msgstr "å¤§å¤æ°æµè§å¨ä¸ç»æé´ä¸ºæ¯ä¸ä¸ªç¨æ·åå»ºç¬ä¸æ 
äºçæµè§å¨æçº¹ï¼é£å¯ä»¥è¢«ç¨æ¥å¨å¨ç½è¿½è¸ªè¯¥ç¨æ·ã"
 
 #: https//support.torproject.org/faq/faq-3/
 #: (content/faq/faq-3/contents+en.lrquestion.description)
@@ -244,7 +244,7 @@ msgstr ""
 msgid ""
 "Tor Browser is specifically engineered to have a nearly identical (we're not"
 " perfect!) fingerprint across it's users."
-msgstr ""
+msgstr "Tor 
æµè§å¨ç»è¿ç¹æ®è®¾è®¡æ¥ä½¿å¾ææç¨æ·æ¥æè¿ä¹ç¸åçæµè§å¨æçº¹ï¼äººæ
 å®äººï¼ï¼ã"
 
 #: https//support.torproject.org/faq/faq-3/
 #: (content/faq/faq-3/contents+en.lrquestion.description)
@@ -262,7 +262,7 @@ msgstr "è¿æå³çææçTor 
æµè§å¨ç¨æ·çèµ·æ¥é½ä¸æ ·ï¼ä½¿å¾è¿½
 msgid ""
 "There's also a good chance a new add-on will increase the attack surface of "
 "Tor Browser."
-msgstr ""
+msgstr "æ°çæä»¶ä¹æå¯è½å¢å Tor æµè§å¨éå°æ»å»çå çã"
 
 #: https//support.torproject.org/faq/faq-3/
 #: (content/faq/faq-3/contents+en.lrquestion.description)
@@ -271,14 +271,14 @@ msgstr ""
 msgid ""
 "This may allow sensitive data to be leaked or allow an attacker to infect "
 "Tor Browser."
-msgstr ""
+msgstr "è¿å¯è½ä¼åè®¸ææä¿¡æ¯è¢«æ³é²æåè®¸æ»å»èææTor 
æµè§å¨ã"
 
 #: https//support.torproject.org/faq/faq-3/
 #: (content/faq/faq-3/contents+en.lrquestion.description)
 #: https//support.torproject.org/tbb/tbb-14/
 #: (content/tbb/tbb-14/contents+en.lrquestion.description)
 msgid "The add-on itself could even be maliciously designed to spy on you."
-msgstr ""
+msgstr "æä»¶æ¬èº«å¯è½å°±è¢«æ¶æè®¾è®¡ç¨äºçæ§æ¨ã"
 
 #: https//support.torproject.org/faq/faq-3/
 #: (content/faq/faq-3/contents+en.lrquestion.description)
@@ -632,7 +632,7 @@ msgstr "ææç¨æ·é½éè¿åä¸å°æå¡å¨æ¥éè®¯ã"
 msgid ""
 "The provider may charge for use of the proxy, or fund their costs through "
 "advertisements on the server."
-msgstr ""
+msgstr "æä¾èå¯ä»¥å¯¹ä»£ççä½¿ç¨è¿è¡æ¶è´¹ï¼æè
éè¿æå¡å¨ä¸çå¹¿åæ¥æ¯ä»å¶ææ¬ã"
 
 #: https//support.torproject.org/about/how-is-tor-different-from-other-proxies/
 #: 
(content/about/how-is-tor-different-from-other-proxies/contents+en.lrquestion.description)
@@ -650,7 +650,7 @@ msgid ""
 "Simple proxy providers are fine solutions if you do not want protections for"
 " your privacy and anonymity online and you trust the provider to not do bad "
 "things."
-msgstr ""
+msgstr 
"å¦ææ¨ä¸å¸æå¨çº¿ä¿æ¤èªå·±çéç§åå¿åæ§ï¼å¹¶ä¸æ¨ç¸ä¿¡æä¾è
ä¸ä¼ååäºï¼é£ä¹ç®åçä»£çæä¾èå°±æ¯å¾å¥½çè§£å³æ¹æ¡ã"
 
 #: https//support.torproject.org/about/how-is-tor-different-from-other-proxies/
 #: 
(content/about/how-is-tor-different-from-other-proxies/contents+en.lrquestion.description)
@@ -658,7 +658,7 @@ msgid ""
 "Some simple proxy providers use SSL to secure your connection to them, which"
 " protects you against local eavesdroppers, such as those at a cafe with free"
 " wifi Internet."
-msgstr ""
+msgstr 
"ä¸äºç®åçä»£çæä¾ç¨åºä½¿ç¨SSLæ¥ä¿æ¤æ¨ä¸å®ä»¬ä¹é´çè¿æ¥ï¼ä»èä¿æ¤æ¨å
åæ¬å°çªå¬èçä¾µå®³ï¼ä¾å¦å¨å¸¦æå
è´¹wifiä¸ç½çåå¡é¦ä¸ã"
 
 #: https//support.torproject.org/about/how-is-tor-different-from-other-proxies/
 #: 
(content/about/how-is-tor-different-from-other-proxies/contents+en.lrquestion.description)
@@ -711,7 +711,7 @@ msgstr ""
 msgid ""
 "Your traffic is encrypted between the Tor client (on your computer) and "
 "where it pops out somewhere else in the world."
-msgstr ""
+msgstr "æ¨çæµéå¨Torå®¢æ·ç«¯ï¼å¨æ¨çè®¡ç®æºä¸ï¼ä¸ä¸çå
¶ä»å°æ¹å¼¹åºçç«ç¹ä¹é´è¿è¡äºå å¯ã"
 
 #: https//support.torproject.org/about/how-is-tor-different-from-other-proxies/
 #:

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

2019-10-03 Thread translation

commit b80ed4976cc919566d76731ba8e5fa9f22e100fe
Author: Translation commit bot 
Date:   Thu Oct 3 15:17:21 2019 +


https://gitweb.torproject.org/translation.git/commit/?h=snowflake-website-indexhtml
---
 nl/index.html | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/nl/index.html b/nl/index.html
index 87c6ce4f7..01260f1f1 100644
--- a/nl/index.html
+++ b/nl/index.html
@@ -53,8 +53,7 @@
 
   PROBLEMEN MELDEN
   
-  If you encounter problems with Snowflake as a client or a proxy,
-  please consider filing a bug.  To do so, you will have to,
+  Als je een probleem ervaart bij het uitvoeren van Snowflake als een 
cliÃ«nt of als een proxy, overweeg dan om een fout-rapportage in te dienen. Om 
dat te doen:
   
   
 Either https://trac.torproject.org/projects/tor/register;>create 
an

___
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

2019-10-03 Thread translation

commit f6283fa59ccee3fe65afb6c1848c1d1bbc337ba1
Author: Translation commit bot 
Date:   Thu Oct 3 15:16:05 2019 +

https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere
---
 nl/ssl-observatory.dtd | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nl/ssl-observatory.dtd b/nl/ssl-observatory.dtd
index c68e5cf43..eedcff251 100644
--- a/nl/ssl-observatory.dtd
+++ b/nl/ssl-observatory.dtd
@@ -55,7 +55,7 @@ zeer ingrijpend bedrijfsnetwerk gebruikt:">
 
 
@@ -66,8 +66,8 @@ Mouseover the options for further details:">-->
 
 https://www.something.com bezoekt, geeft het door het
-observatorium ontvangen certificaat aan dat iemand www.something.com bezocht,
+"Als u bijvoorbeeld https://www.voorbeeld.nl bezoekt, geeft het door het
+observatorium ontvangen certificaat aan dat iemand www.voorbeeld.nl bezocht,
 maar niet wie de website bezocht of welke specifieke pagina de bezoeker
 bekeek. Houd de muis boven de opties voor meer details:">
 

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

[tor-commits] [tpo/master] use ahf's current ldap key too

2019-10-03 Thread arma

commit 9f732685a9cf34feeb23b5ee8590ee6ee082615b
Author: Roger Dingledine 
Date:   Thu Oct 3 11:06:29 2019 -0400

use ahf's current ldap key too

the old key was a 404
---
 content/about/people/ahf/contents.lr | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/content/about/people/ahf/contents.lr 
b/content/about/people/ahf/contents.lr
index d49d8ac..b6175e7 100644
--- a/content/about/people/ahf/contents.lr
+++ b/content/about/people/ahf/contents.lr
@@ -12,7 +12,7 @@ pronoun: he
 ---
 nickname: ahf
 ---
-gpg: 
https://db.torproject.org/fetchkey.cgi?fingerprint=FDB16F45A477B314E87432EC61A208E16E7CB435
+gpg: 
https://db.torproject.org/fetchkey.cgi?fingerprint=1C2A7A3D5A8548B4ADEFD52AF9BC2FE22B08CE8F
 ---
 
 description:

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

[tor-commits] [tpo/master] i guess anarcat updated my key in ldap

2019-10-03 Thread arma

commit abc5813bf53874261a1216952f8218dfe0e6d8bd
Author: Roger Dingledine 
Date:   Thu Oct 3 10:57:33 2019 -0400

i guess anarcat updated my key in ldap

fixes a 404 that the link currently goes to
---
 content/about/people/arma/contents.lr | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/content/about/people/arma/contents.lr 
b/content/about/people/arma/contents.lr
index 75e1327..c09d3d6 100644
--- a/content/about/people/arma/contents.lr
+++ b/content/about/people/arma/contents.lr
@@ -12,7 +12,7 @@ pronoun: he
 ---
 twitter_handle: RogerDingledine
 ---
-gpg: 
https://db.torproject.org/fetchkey.cgi?fingerprint=B1172656DFF983C3042BC699EB5A896A28988BF5
+gpg: 
https://db.torproject.org/fetchkey.cgi?fingerprint=F65CE37F04BA5B360AE6EE17C218525819F78451
 ---
 image: /static/images/people/arma.png
 ---

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

1 2 >

1 - 100 of 145 matches

Mail list logo