February 2020 - tor-commits - lists.torproject.org

[bridgedb/master] Merge branch 'release-0.9.2'
by phw＠torproject.org 04 Feb '20

04 Feb '20

commit ae0c4eb80047735ff6e7498309332d8d497e37f9 Merge: 5bded87 ce1dfca Author: Philipp Winter <phw(a)nymity.ch> Date: Tue Feb 4 11:26:57 2020 -0800 Merge branch 'release-0.9.2' .test.requirements.txt | 6 +-- .travis.requirements.txt | 20 ++++----- AUTHORS | 1 + CHANGELOG | 7 +++ README.rst | 5 +-- bridgedb/distributors/https/templates/base.html | 4 +- bridgedb/i18n/templates/bridgedb.pot | 60 +++++++++++++------------ bridgedb/strings.py | 8 ++-- doc/HACKING.md | 3 +- requirements.txt | 16 +++---- scripts/create_descriptors | 4 ++ 11 files changed, 76 insertions(+), 58 deletions(-)

1 0

[bridgedb/develop] Merge branch 'release-0.9.1'
by phw＠torproject.org 04 Feb '20

04 Feb '20

commit 5bded87168083023839d89046086c70680275040 Merge: 681963d 5a4c972 Author: Philipp Winter <phw(a)nymity.ch> Date: Tue Oct 29 09:13:11 2019 -0700 Merge branch 'release-0.9.1' .travis.requirements.txt | 4 +- CHANGELOG | 15 +++++++ README.rst | 38 +++++++--------- bridgedb/i18n/templates/bridgedb.pot | 86 ++++++++++++++++++++---------------- bridgedb/metrics.py | 17 ++++--- bridgedb/strings.py | 6 ++- bridgedb/test/test_metrics.py | 11 +++++ requirements.txt | 4 +- 8 files changed, 108 insertions(+), 73 deletions(-)

1 0

[bridgedb/develop] Add Cecylia as core maintainer.
by phw＠torproject.org 04 Feb '20

04 Feb '20

commit da46bab3ecfedb5d020a2acc3cba30286e9ced89 Author: Philipp Winter <phw(a)nymity.ch> Date: Tue Jan 28 09:38:07 2020 -0800 Add Cecylia as core maintainer. --- AUTHORS | 1 + 1 file changed, 1 insertion(+) diff --git a/AUTHORS b/AUTHORS index df60ed3..d492629 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,5 +1,6 @@ Current core developers: Philipp Winter <phw(a)torproject.org> + Cecylia Bocovich <cohosh(a)torproject.org> Past core developers: Matthew Finkel <sysrqb(a)torproject.org> 0x017DD169EA793BE2

1 0

[bridgedb/develop] Change order of git release commands.
by phw＠torproject.org 04 Feb '20

04 Feb '20

commit e9820372bfa75048d5823e4a5ee810ca0d05db48 Author: Philipp Winter <phw(a)nymity.ch> Date: Tue Jan 28 09:52:36 2020 -0800 Change order of git release commands. * Add a reminder that we should bump the version number in CHANGELOG after we checked out the release branch. * Tag a new release after merging the release branch back into master, as it is suggested in: <https://nvie.com/posts/a-successful-git-branching-model/#finishing-a-releas…> --- doc/HACKING.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/HACKING.md b/doc/HACKING.md index 5993696..7e76a9b 100644 --- a/doc/HACKING.md +++ b/doc/HACKING.md @@ -58,10 +58,11 @@ deploy time, as of right now) means doing the following: $ git checkout develop [merge some fix/bug/feature/etc branches] $ git checkout -b release-0.0.2 develop - $ git tag -a -s bridgedb-0.0.2 + [bump version number in CHANGELOG] [pip maintainance commands *would* go here, if we ever have any] $ git checkout master $ git merge -S --no-ff release-0.0.2 + $ git tag -a -s bridgedb-0.0.2 $ git checkout develop $ git merge -S --no-ff master $ git push <remote> master develop

1 0

[bridgedb/develop] Remove isis as default trac owner and cc contact.
by phw＠torproject.org 04 Feb '20

04 Feb '20

commit 045e34b829feef47426d65ae49c6a55247c9bc4d Author: Philipp Winter <phw(a)nymity.ch> Date: Tue Jan 28 09:46:23 2020 -0800 Remove isis as default trac owner and cc contact. Isis hasn't been maintaining BridgeDB in quite a while. By omitting the owner and CC field, we're leaving it up to trac to pick its defaults. --- bridgedb/distributors/https/templates/base.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bridgedb/distributors/https/templates/base.html b/bridgedb/distributors/https/templates/base.html index 9372505..fb54e81 100644 --- a/bridgedb/distributors/https/templates/base.html +++ b/bridgedb/distributors/https/templates/base.html @@ -88,7 +88,7 @@ ${next.body(strings, langs, rtl=rtl, lang=lang, langOverride=langOverride, **kwa <div class="footer footer-small"> <hr> - <a href="https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…"> + <a href="https://trac.torproject.org/projects/tor/newticket?component=Circumvention/…">  ${_("Report a Bug")}</a>   ·   <a href="https://gitweb.torproject.org/bridgedb.git">

1 0

[bridgedb/develop] Remove Matt's email from "Contact & Support".
by phw＠torproject.org 04 Feb '20

04 Feb '20

commit cc6bf38d20472a07f04a4731627403666bf146ad Author: Philipp Winter <phw(a)nymity.ch> Date: Tue Jan 28 10:19:39 2020 -0800 Remove Matt's email from "Contact & Support". --- README.rst | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/README.rst b/README.rst index 6fce8a0..896d25d 100644 --- a/README.rst +++ b/README.rst @@ -569,6 +569,5 @@ Contact & Support ================= Send your questions, patches, and suggestions to -`the tor-dev mailing list <mailto:tor-dev@lists.torproject.org>`__, -`sysrqb <mailto:sysrqb@torproject.org>`__, or -`phw <mailto:phw@torproject.org>`__. +`the tor-dev mailing list <mailto:tor-dev@lists.torproject.org>`__, or to +`Philipp Winter <mailto:phw@torproject.org>`__.

1 0

[bridgedb/develop] Explain what should go into the email body.
by phw＠torproject.org 04 Feb '20

04 Feb '20

commit 6a4891cf07aa5181ffc351a1a86765f981e1ce5a Author: Philipp Winter <phw(a)nymity.ch> Date: Tue Jan 28 10:36:01 2020 -0800 Explain what should go into the email body. ...if we don't explain it here, we're forcing our users to go through at least one iteration of BridgeDB's help emails. Also, we might as well tell people to request an obfs4 bridge because vanilla bridges are less useful to the average user. --- bridgedb/i18n/templates/bridgedb.pot | 60 +++++++++++++++++++----------------- bridgedb/strings.py | 8 +++-- 2 files changed, 37 insertions(+), 31 deletions(-) diff --git a/bridgedb/i18n/templates/bridgedb.pot b/bridgedb/i18n/templates/bridgedb.pot index 7e16c26..483abbc 100644 --- a/bridgedb/i18n/templates/bridgedb.pot +++ b/bridgedb/i18n/templates/bridgedb.pot @@ -1,15 +1,15 @@ # Translations template for bridgedb. -# Copyright (C) 2019 'The Tor Project, Inc.' +# Copyright (C) 2020 'The Tor Project, Inc.' # This file is distributed under the same license as the bridgedb project. -# FIRST AUTHOR <EMAIL@ADDRESS>, 2019. +# FIRST AUTHOR <EMAIL@ADDRESS>, 2020. # msgid "" msgstr "" -"Project-Id-Version: bridgedb 0.9.0+3.gfd0c28d.dirty\n" +"Project-Id-Version: bridgedb 0.9.0+19.ga5fa455.dirty\n" "Report-Msgid-Bugs-To: " "'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…" "=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n" -"POT-Creation-Date: 2019-10-19 14:51-0700\n" +"POT-Creation-Date: 2020-02-04 10:59-0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" @@ -283,62 +283,66 @@ msgstr "" msgid "I need an alternative way of getting bridges!" msgstr "" -#: bridgedb/strings.py:108 +#. TRANSLATORS: Please DO NOT translate "get transport obfs4". +#: bridgedb/strings.py:109 #, python-format 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." +"Another way to get bridges is to send an email to %s. Leave the email subject" +"\n" +"empty and write \"get transport obfs4\" in the email's message body. Please " +"note\n" +"that you must send the email using an address from one of the following email" +"\n" +"providers: %s or %s." msgstr "" -#: bridgedb/strings.py:115 +#: bridgedb/strings.py:117 msgid "My bridges don't work! I need help!" msgstr "" #. TRANSLATORS: Please DO NOT translate "Tor Browser". #. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and #. "Support Portal", respectively. -#: bridgedb/strings.py:119 +#: bridgedb/strings.py:121 #, python-format msgid "If your Tor Browser cannot connect, please take a look at the %s and our %s." msgstr "" -#: bridgedb/strings.py:123 +#: bridgedb/strings.py:125 msgid "Here are your bridge lines:" msgstr "" -#: bridgedb/strings.py:124 +#: bridgedb/strings.py:126 msgid "Get Bridges!" msgstr "" -#: bridgedb/strings.py:128 +#: bridgedb/strings.py:130 msgid "Please select options for bridge type:" msgstr "" -#: bridgedb/strings.py:129 +#: bridgedb/strings.py:131 msgid "Do you need IPv6 addresses?" msgstr "" -#: bridgedb/strings.py:130 +#: bridgedb/strings.py:132 #, python-format msgid "Do you need a %s?" msgstr "" -#: bridgedb/strings.py:134 +#: bridgedb/strings.py:136 msgid "Your browser is not displaying images properly." msgstr "" -#: bridgedb/strings.py:135 +#: bridgedb/strings.py:137 msgid "Enter the characters from the image above..." msgstr "" -#: bridgedb/strings.py:139 +#: bridgedb/strings.py:141 msgid "How to start using your bridges" msgstr "" #. TRANSLATORS: Please DO NOT translate "Tor Browser". -#: bridgedb/strings.py:141 +#: bridgedb/strings.py:143 #, python-format msgid "" "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n" @@ -347,7 +351,7 @@ msgid "" msgstr "" #. TRANSLATORS: Please DO NOT translate "Tor". -#: bridgedb/strings.py:146 +#: bridgedb/strings.py:148 msgid "" "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and " "follow\n" @@ -355,7 +359,7 @@ msgid "" msgstr "" #. TRANSLATORS: Please DO NOT translate "Tor". -#: bridgedb/strings.py:150 +#: bridgedb/strings.py:152 msgid "" "Does your Internet Service Provider (ISP) block or otherwise censor " "connections\n" @@ -363,7 +367,7 @@ msgid "" msgstr "" #. TRANSLATORS: Please DO NOT translate "Tor". -#: bridgedb/strings.py:154 +#: bridgedb/strings.py:156 msgid "" "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n" "paste the bridge lines into the text input box. Finally, click 'Connect', and" @@ -372,29 +376,29 @@ msgid "" "button in the 'Tor Network Settings' wizard for further assistance." msgstr "" -#: bridgedb/strings.py:162 +#: bridgedb/strings.py:164 msgid "Displays this message." msgstr "" #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the #. same non-Pluggable Transport bridges described above as being #. "plain-ol'-vanilla" bridges. -#: bridgedb/strings.py:166 +#: bridgedb/strings.py:168 msgid "Request vanilla bridges." msgstr "" -#: bridgedb/strings.py:167 +#: bridgedb/strings.py:169 msgid "Request IPv6 bridges." msgstr "" #. TRANSLATORS: Please DO NOT translate the word the word "TYPE". -#: bridgedb/strings.py:169 +#: bridgedb/strings.py:171 msgid "Request a Pluggable Transport by TYPE." msgstr "" #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: Please DO NOT translate "GnuPG". -#: bridgedb/strings.py:172 +#: bridgedb/strings.py:174 msgid "Get a copy of BridgeDB's public GnuPG key." msgstr "" diff --git a/bridgedb/strings.py b/bridgedb/strings.py index f6e2d69..e97c68a 100644 --- a/bridgedb/strings.py +++ b/bridgedb/strings.py @@ -105,10 +105,12 @@ FAQ = { OTHER_DISTRIBUTORS = { 0: _("I need an alternative way of getting bridges!"), +# TRANSLATORS: Please DO NOT translate "get transport obfs4". 1: _("""\ -Another way to get bridges is to send an email to %s. Please note that you must -send the email using an address from one of the following email providers: -%s or %s."""), +Another way to get bridges is to send an email to %s. Leave the email subject +empty and write "get transport obfs4" in the email's message body. Please note +that you must send the email using an address from one of the following email +providers: %s or %s."""), } HELP = {

1 0

[bridgedb/develop] Mention that #31427 is now fixed.
by phw＠torproject.org 04 Feb '20

04 Feb '20

commit 19403caadd3385176f8b3766a46df008747db90f Author: Philipp Winter <phw(a)nymity.ch> Date: Tue Feb 4 11:07:05 2020 -0800 Mention that #31427 is now fixed. --- CHANGELOG | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 3ff05db..ec0d6d6 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,10 @@ +Changes in version X.Y.Z - YYYY-MM-DD + + * FIXES <https://bugs.torproject.org/31427> + This patch updates the AUTHORS file, HACKING.md, contact information, + the Trac URL to report bugs, our instructions on BridgeDB's landing + page, and it fixes a small bug in descriptor generation. + Changes in version 0.9.1 - 2019-10-29 * FIXES https://bugs.torproject.org/32203

1 0

[bridgedb/develop] Merge branch 'fix/31427' into develop
by phw＠torproject.org 04 Feb '20

04 Feb '20

commit 74d1ec7547fe910a7dca1853229ca6afd8604fb8 Merge: 538895b 19403ca Author: Philipp Winter <phw(a)nymity.ch> Date: Tue Feb 4 11:12:53 2020 -0800 Merge branch 'fix/31427' into develop AUTHORS | 1 + CHANGELOG | 7 +++ README.rst | 5 +-- bridgedb/distributors/https/templates/base.html | 2 +- bridgedb/i18n/templates/bridgedb.pot | 60 +++++++++++++------------ bridgedb/strings.py | 8 ++-- doc/HACKING.md | 3 +- scripts/create_descriptors | 4 ++ 8 files changed, 54 insertions(+), 36 deletions(-)

1 0

[bridgedb/develop] Make sure that ports don't end up being negative.
by phw＠torproject.org 04 Feb '20

04 Feb '20

commit 4c3aad92ce78625e417b9afd42f614f72707b475 Author: Philipp Winter <phw(a)nymity.ch> Date: Tue Jan 28 10:51:23 2020 -0800 Make sure that ports don't end up being negative. This fixes a bug that our CI system stumbled upon: +./scripts/create_descriptors 200 --num-resistant-descs 100 Traceback (most recent call last): File "./scripts/create_descriptors", line 298, in <module> make_descriptors(args.num_descs, args.num_resistant_descs) File "./scripts/create_descriptors", line 266, in make_descriptors num_probing_resistant > 0) File "./scripts/create_descriptors", line 242, in create_extrainfo_desc }, signing_key=signing_key) File "/home/travis/virtualenv/python2.7.15/lib/python2.7/site-packages/stem/descriptor/extrainfo_descriptor.py", line 944, in create return cls(cls.content(attr, exclude, sign, signing_key), validate = validate) File "/home/travis/virtualenv/python2.7.15/lib/python2.7/site-packages/stem/descriptor/extrainfo_descriptor.py", line 865, in __init__ self._parse(entries, validate) File "/home/travis/virtualenv/python2.7.15/lib/python2.7/site-packages/stem/descriptor/__init__.py", line 744, in _parse parser_for_line[keyword](self, entries) File "/home/travis/virtualenv/python2.7.15/lib/python2.7/site-packages/stem/descriptor/extrainfo_descriptor.py", line 296, in _parse_transport_line raise ValueError('Transport line has a malformed port: transport %s' % value) ValueError: Transport line has a malformed port: transport obfs3 203.54.46.87:-2 --- scripts/create_descriptors | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scripts/create_descriptors b/scripts/create_descriptors index 839a6ba..ab6ea2e 100755 --- a/scripts/create_descriptors +++ b/scripts/create_descriptors @@ -85,6 +85,10 @@ def get_transport_line(probing_resistant, addr, port): active probing attacks. """ + # Make sure that we won't end up with a negative port. + if port <= 21: + port = 21 + transports = [] if probing_resistant: transports.append("obfs2 %s:%s" % (addr, port-10))

1 0