Unverified Commit ae0c4eb8 authored by Philipp Winter's avatar Philipp Winter
Browse files

Merge branch 'release-0.9.2'

parents 5bded871 ce1dfcaa
......@@ -5,8 +5,8 @@
# $ pip install -r .test.requirements.txt
# $ make coverage
#
coverage==4.5.4
mechanize==0.4.3
coverage==5.0.3
mechanize==0.4.5
pep8==1.7.1
pylint==2.4.2
pylint==2.4.4
sure==1.4.11
......@@ -13,20 +13,20 @@
# $ make coverage
#
#------------------------------------------------------------------------------
Babel==2.7.0
Babel==2.8.0
BeautifulSoup==3.2.2
Mako==1.1.0
pycryptodome==3.9.0
Twisted==19.7.0
coverage==4.5.4
coveralls==1.8.2
Mako==1.1.1
pycryptodome==3.9.6
Twisted==19.10.0
coverage==5.0.3
coveralls==1.10.0
gnupg==2.3.1
ipaddr==2.2.0
mechanize==0.4.3
Pillow==6.2.1
mechanize==0.4.5
Pillow==6.2.2
pygeoip==0.3.2
qrcode==6.1
service_identity==18.1.0
stem==1.7.1
stem==1.8.0
sure==1.4.11
zope.interface==4.6.0
zope.interface==4.7.1
Current core developers:
Philipp Winter <phw@torproject.org>
Cecylia Bocovich <cohosh@torproject.org>
Past core developers:
Matthew Finkel <sysrqb@torproject.org> 0x017DD169EA793BE2
......
Changes in version 0.9.2 - 2020-02-04
* 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
......
......@@ -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>`__.
......@@ -65,7 +65,7 @@ ${next.body(strings, langs, rtl=rtl, lang=lang, langOverride=langOverride, **kwa
<h4>${_(strings.FAQ[0])}</h4>
<p>
${_(strings.FAQ[1]) % \
("""<a href="https://www.torproject.org/docs/bridges">""", "</a>")}
("""<a href="https://tb-manual.torproject.org/bridges/">""", "</a>")}
</p>
<h4>${_(strings.OTHER_DISTRIBUTORS[0])}</h4>
......@@ -88,7 +88,7 @@ ${next.body(strings, langs, rtl=rtl, lang=lang, langOverride=langOverride, **kwa
<div class="footer footer-small">
<hr>
<p>
<a href="https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reportbug&cc=isis&owner=isis">
<a href="https://trac.torproject.org/projects/tor/newticket?component=Circumvention/BridgeDB&keywords=bridgedb-reportbug">
<i class="icon icon-large icon-bug"><span id="footer-bugs">&nbsp;${_("Report a Bug")}</span></i></a>
&nbsp; &middot; &nbsp;
<a href="https://gitweb.torproject.org/bridgedb.git">
......
# 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&keywords"
"=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@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 ""
......@@ -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 = {
......
......@@ -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
......
Babel==2.7.0
Babel==2.8.0
BeautifulSoup==3.2.2
Mako==1.1.0
pycryptodome==3.9.0
Twisted==19.7.0
Mako==1.1.1
pycryptodome==3.9.6
Twisted==19.10.0
gnupg==2.3.1
ipaddr==2.2.0
Pillow==6.2.1
pyOpenSSL==19.0.0
Pillow==6.2.2
pyOpenSSL==19.1.0
pygeoip==0.3.2
qrcode==6.1
service_identity==18.1.0
stem==1.7.1
zope.interface==4.6.0
stem==1.8.0
zope.interface==4.7.1
......@@ -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))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment