July 2014 - tor-commits - lists.torproject.org

[translation/tails-persistence-setup] Update translations for tails-persistence-setup
by translation＠torproject.org 23 Jul '14

23 Jul '14

commit 1f7fd3309f40ba37531cb1304bc5218c36bd9e93 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jul 23 10:45:21 2014 +0000 Update translations for tails-persistence-setup --- sk_SK/sk_SK.po | 47 ++++++++++++++++++++++++----------------------- 1 file changed, 24 insertions(+), 23 deletions(-) diff --git a/sk_SK/sk_SK.po b/sk_SK/sk_SK.po index cc5e51b..f777209 100644 --- a/sk_SK/sk_SK.po +++ b/sk_SK/sk_SK.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# once <matejbacik(a)gmail.com>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" -"POT-Creation-Date: 2014-04-16 21:26+0200\n" -"PO-Revision-Date: 2014-04-17 09:09+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"POT-Creation-Date: 2014-07-01 22:15+0200\n" +"PO-Revision-Date: 2014-07-23 10:41+0000\n" +"Last-Translator: once <matejbacik(a)gmail.com>\n" "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/torproject/language/sk_SK/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -27,7 +28,7 @@ msgstr "" #: ../lib/Tails/Persistence/Configuration/Presets.pm:58 msgid "GnuPG" -msgstr "" +msgstr "GnuPG" #: ../lib/Tails/Persistence/Configuration/Presets.pm:60 msgid "GnuPG keyrings and configuration" @@ -35,11 +36,11 @@ msgstr "" #: ../lib/Tails/Persistence/Configuration/Presets.pm:68 msgid "SSH Client" -msgstr "" +msgstr "SSH klient" #: ../lib/Tails/Persistence/Configuration/Presets.pm:70 msgid "SSH keys, configuration and known hosts" -msgstr "" +msgstr "SSH kľúče, nastavenia a známi hostitelia" #: ../lib/Tails/Persistence/Configuration/Presets.pm:78 msgid "Pidgin" @@ -118,67 +119,67 @@ msgstr "" msgid "Setup Tails persistent volume" msgstr "" -#: ../lib/Tails/Persistence/Setup.pm:337 +#: ../lib/Tails/Persistence/Setup.pm:307 ../lib/Tails/Persistence/Setup.pm:452 +msgid "Error" +msgstr "" + +#: ../lib/Tails/Persistence/Setup.pm:339 #, perl-format msgid "Device %s already has a persistent volume." msgstr "" -#: ../lib/Tails/Persistence/Setup.pm:345 +#: ../lib/Tails/Persistence/Setup.pm:347 #, perl-format msgid "Device %s has not enough unallocated space." msgstr "" -#: ../lib/Tails/Persistence/Setup.pm:353 ../lib/Tails/Persistence/Setup.pm:367 +#: ../lib/Tails/Persistence/Setup.pm:355 ../lib/Tails/Persistence/Setup.pm:369 #, perl-format msgid "Device %s has no persistent volume." msgstr "" -#: ../lib/Tails/Persistence/Setup.pm:359 +#: ../lib/Tails/Persistence/Setup.pm:361 msgid "" "Cannot delete the persistent volume while in use. You should restart Tails " "without persistence." msgstr "" -#: ../lib/Tails/Persistence/Setup.pm:378 +#: ../lib/Tails/Persistence/Setup.pm:380 msgid "Persistence volume is not unlocked." msgstr "" -#: ../lib/Tails/Persistence/Setup.pm:383 +#: ../lib/Tails/Persistence/Setup.pm:385 msgid "Persistence volume is not mounted." msgstr "" -#: ../lib/Tails/Persistence/Setup.pm:388 +#: ../lib/Tails/Persistence/Setup.pm:390 msgid "Persistence volume is not readable. Permissions or ownership problems?" msgstr "" -#: ../lib/Tails/Persistence/Setup.pm:393 +#: ../lib/Tails/Persistence/Setup.pm:395 msgid "Persistence volume is not writable. Maybe it was mounted read-only?" msgstr "" -#: ../lib/Tails/Persistence/Setup.pm:402 +#: ../lib/Tails/Persistence/Setup.pm:404 #, perl-format msgid "Tails is running from non-USB / non-SDIO device %s." msgstr "" -#: ../lib/Tails/Persistence/Setup.pm:408 +#: ../lib/Tails/Persistence/Setup.pm:410 #, perl-format msgid "Device %s is optical." msgstr "" -#: ../lib/Tails/Persistence/Setup.pm:415 +#: ../lib/Tails/Persistence/Setup.pm:417 #, perl-format msgid "Device %s was not created using Tails Installer." msgstr "" -#: ../lib/Tails/Persistence/Setup.pm:450 -msgid "Error" -msgstr "" - -#: ../lib/Tails/Persistence/Setup.pm:670 +#: ../lib/Tails/Persistence/Setup.pm:677 msgid "Persistence wizard - Finished" msgstr "" -#: ../lib/Tails/Persistence/Setup.pm:673 +#: ../lib/Tails/Persistence/Setup.pm:680 msgid "" "Any changes you have made will only take effect after restarting Tails.\n" "\n"

1 0

[tor-browser-bundle/master] Switch FTE bridges to IP-only+separate IPv6 bridges.
by mikeperry＠torproject.org 23 Jul '14

23 Jul '14

commit ece1766b18f94b7937ac2497d7e3fb4b5fd62965 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Jul 22 20:53:25 2014 -0700 Switch FTE bridges to IP-only+separate IPv6 bridges. --- Bundle-Data/PTConfigs/bridge_prefs.js | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/Bundle-Data/PTConfigs/bridge_prefs.js b/Bundle-Data/PTConfigs/bridge_prefs.js index 6ee714d..5abe0cc 100644 --- a/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/Bundle-Data/PTConfigs/bridge_prefs.js @@ -17,21 +17,16 @@ pref("extensions.torlauncher.default_bridge.flashproxy.4", "flashproxy 0.0.1.0:4 pref("extensions.torlauncher.default_bridge.flashproxy.5", "flashproxy 0.0.1.0:5"); // <ipv4> -pref("extensions.torlauncher.default_bridge.fte.1", "fte t5fPOQM3-1097909862.us-west-2.elb.amazonaws.com:80 6E6298B85B171FEA4E36ADB15D6FF95DA0B37C89"); -pref("extensions.torlauncher.default_bridge.fte.2", "fte 54.244.94.118:80 6E6298B85B171FEA4E36ADB15D6FF95DA0B37C89"); -pref("extensions.torlauncher.default_bridge.fte.3", "fte 131.252.210.150:8080 0E858AC201BF0F3FA3C462F64844CBFFC7297A42"); -pref("extensions.torlauncher.default_bridge.fte.4", "fte server-01.fteproxy.net:8080 0E858AC201BF0F3FA3C462F64844CBFFC7297A42"); -pref("extensions.torlauncher.default_bridge.fte.5", "fte 128.105.214.161:8080 1E326AAFB3FCB515015250D8FCCC8E37F91A153B"); -pref("extensions.torlauncher.default_bridge.fte.6", "fte server-02.fteproxy.net:8080 1E326AAFB3FCB515015250D8FCCC8E37F91A153B"); -pref("extensions.torlauncher.default_bridge.fte.7", "fte 128.105.214.162:8080 FC562097E1951DCC41B7D7F324D88157119BB56D"); -pref("extensions.torlauncher.default_bridge.fte.8", "fte server-03.fteproxy.net:8080 FC562097E1951DCC41B7D7F324D88157119BB56D"); -pref("extensions.torlauncher.default_bridge.fte.9", "fte 128.105.214.163:8080 A17A40775FBD2CA1184BF80BFC330A77ECF9D0E9"); -pref("extensions.torlauncher.default_bridge.fte.10", "fte server-04.fteproxy.net:8080 A17A40775FBD2CA1184BF80BFC330A77ECF9D0E9"); -pref("extensions.torlauncher.default_bridge.fte.11", "fte 79.125.3.12:8080 272465348803EE2546A9BB8EE37D462915531F09"); -pref("extensions.torlauncher.default_bridge.fte.12", "fte server-05.fteproxy.net:8080 272465348803EE2546A9BB8EE37D462915531F09"); +pref("extensions.torlauncher.default_bridge.fte.1", "fte 54.244.94.118:80 6E6298B85B171FEA4E36ADB15D6FF95DA0B37C89"); +pref("extensions.torlauncher.default_bridge.fte.2", "fte 131.252.210.150:8080 0E858AC201BF0F3FA3C462F64844CBFFC7297A42"); +pref("extensions.torlauncher.default_bridge.fte.3", "fte 128.105.214.161:8080 1E326AAFB3FCB515015250D8FCCC8E37F91A153B"); +pref("extensions.torlauncher.default_bridge.fte.4", "fte 128.105.214.162:8080 FC562097E1951DCC41B7D7F324D88157119BB56D"); +pref("extensions.torlauncher.default_bridge.fte.5", "fte 128.105.214.163:8080 A17A40775FBD2CA1184BF80BFC330A77ECF9D0E9"); +pref("extensions.torlauncher.default_bridge.fte.6", "fte 79.125.3.12:8080 272465348803EE2546A9BB8EE37D462915531F09"); // </ipv4> // <ipv6> -pref("extensions.torlauncher.default_bridge.fte.13", "fte ipv6.t5fPOQM3-1097909862.us-west-2.elb.amazonaws.com:80 6E6298B85B171FEA4E36ADB15D6FF95DA0B37C89"); +pref("extensions.torlauncher.default_bridge.fte-ipv6.1", "fte 2620:108:700f::36f5:f95b:80 6E6298B85B171FEA4E36ADB15D6FF95DA0B37C89"); +pref("extensions.torlauncher.default_bridge.fte-ipv6.2", "fte 2620:108:700f::36d6:163f:80 6E6298B85B171FEA4E36ADB15D6FF95DA0B37C89"); // </ipv6> pref("extensions.torlauncher.default_bridge.scramblesuit.1", "scramblesuit 188.40.121.112:39707 5DE8D363D8F150C99E1A2D7237368D614838132C password=L5POGQONBPS2HZUR6GXBIDS4CMIYYOTI");

1 0

[tor-browser-bundle/maint-3.6] Version bump and changelog for 3.6.3.
by mikeperry＠torproject.org 23 Jul '14

23 Jul '14

commit 255493e367e32e12f2d32abd437d4987375a2804 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Jul 22 20:52:25 2014 -0700 Version bump and changelog for 3.6.3. --- Bundle-Data/Docs/ChangeLog.txt | 17 +++++++++++++++++ gitian/versions | 4 ++-- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 3ea5232..ae783f6 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,20 @@ +Tor Browser Bundle 3.6.3 -- Jul 24 2014 + * All Platforms + * Update Firefox to 24.7.0esr + * Update NoScript to 2.6.8.33 + * Update HTTPS Everywhere to 3.5.3 + * Update Torbutton to 1.6.11.0 + * Bug 12221: Remove obsolete Javascript components from the toggle era + * Bug 10819: Bind new third party isolation pref to Torbutton security UI + * Bug 9268: Fix some window resizing corner cases with DPI and taskbar size. + * Bug 12381: Fix Pluggable Transport+Proxy Support on Windows + * Update obfsproxy to 0.2.12 + * Update FTE to 0.2.17 + * Linux: + * Bug 11102: Set Window Class to "Tor Browser" to aid in Desktop navigation + * Bug 12249: Don't create PT debug files anymore + + Tor Browser Bundle 3.6.2 -- Jun 9 2014 * All Platforms * Update Firefox to 24.6.0esr diff --git a/gitian/versions b/gitian/versions index e11d9f1..c7348b7 100755 --- a/gitian/versions +++ b/gitian/versions @@ -1,4 +1,4 @@ -TORBROWSER_VERSION=3.6.3pre +TORBROWSER_VERSION=3.6.3 BUNDLE_LOCALES="ar de es-ES fa fr it ko nl pl pt-PT ru tr vi zh-CN" BUILD_PT_BUNDLES=1 @@ -9,7 +9,7 @@ FIREFOX_VERSION=24.7.0esr TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-3.x-1-build1 TOR_TAG=tor-0.2.4.22 TORLAUNCHER_TAG=0.2.5.5 -TORBUTTON_TAG=1.6.10.0 +TORBUTTON_TAG=1.6.11.0 HTTPSE_TAG=3.5.3 # XXX: HTTPSE_VER is used instead, pending #11630 NSIS_TAG=v0.1 ZLIB_TAG=v1.2.8

1 0

[tor-browser-bundle/maint-3.6] Switch FTE bridges to IP-only+separate IPv6 bridges.
by mikeperry＠torproject.org 23 Jul '14

23 Jul '14

commit ecd19a6a88058dedb1726747eb4184a959d5af6b Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Jul 22 20:47:02 2014 -0700 Switch FTE bridges to IP-only+separate IPv6 bridges. --- Bundle-Data/PTConfigs/bridge_prefs.js | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/Bundle-Data/PTConfigs/bridge_prefs.js b/Bundle-Data/PTConfigs/bridge_prefs.js index 9cb8a6a..5315a32 100644 --- a/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/Bundle-Data/PTConfigs/bridge_prefs.js @@ -17,21 +17,16 @@ pref("extensions.torlauncher.default_bridge.flashproxy.4", "flashproxy 0.0.1.0:4 pref("extensions.torlauncher.default_bridge.flashproxy.5", "flashproxy 0.0.1.0:5"); // <ipv4> -pref("extensions.torlauncher.default_bridge.fte.1", "fte t5fPOQM3-1097909862.us-west-2.elb.amazonaws.com:80 6E6298B85B171FEA4E36ADB15D6FF95DA0B37C89"); -pref("extensions.torlauncher.default_bridge.fte.2", "fte 54.244.94.118:80 6E6298B85B171FEA4E36ADB15D6FF95DA0B37C89"); -pref("extensions.torlauncher.default_bridge.fte.3", "fte 131.252.210.150:8080 0E858AC201BF0F3FA3C462F64844CBFFC7297A42"); -pref("extensions.torlauncher.default_bridge.fte.4", "fte server-01.fteproxy.net:8080 0E858AC201BF0F3FA3C462F64844CBFFC7297A42"); -pref("extensions.torlauncher.default_bridge.fte.5", "fte 128.105.214.161:8080 1E326AAFB3FCB515015250D8FCCC8E37F91A153B"); -pref("extensions.torlauncher.default_bridge.fte.6", "fte server-02.fteproxy.net:8080 1E326AAFB3FCB515015250D8FCCC8E37F91A153B"); -pref("extensions.torlauncher.default_bridge.fte.7", "fte 128.105.214.162:8080 FC562097E1951DCC41B7D7F324D88157119BB56D"); -pref("extensions.torlauncher.default_bridge.fte.8", "fte server-03.fteproxy.net:8080 FC562097E1951DCC41B7D7F324D88157119BB56D"); -pref("extensions.torlauncher.default_bridge.fte.9", "fte 128.105.214.163:8080 A17A40775FBD2CA1184BF80BFC330A77ECF9D0E9"); -pref("extensions.torlauncher.default_bridge.fte.10", "fte server-04.fteproxy.net:8080 A17A40775FBD2CA1184BF80BFC330A77ECF9D0E9"); -pref("extensions.torlauncher.default_bridge.fte.11", "fte 79.125.3.12:8080 272465348803EE2546A9BB8EE37D462915531F09"); -pref("extensions.torlauncher.default_bridge.fte.12", "fte server-05.fteproxy.net:8080 272465348803EE2546A9BB8EE37D462915531F09"); +pref("extensions.torlauncher.default_bridge.fte.1", "fte 54.244.94.118:80 6E6298B85B171FEA4E36ADB15D6FF95DA0B37C89"); +pref("extensions.torlauncher.default_bridge.fte.2", "fte 131.252.210.150:8080 0E858AC201BF0F3FA3C462F64844CBFFC7297A42"); +pref("extensions.torlauncher.default_bridge.fte.3", "fte 128.105.214.161:8080 1E326AAFB3FCB515015250D8FCCC8E37F91A153B"); +pref("extensions.torlauncher.default_bridge.fte.4", "fte 128.105.214.162:8080 FC562097E1951DCC41B7D7F324D88157119BB56D"); +pref("extensions.torlauncher.default_bridge.fte.5", "fte 128.105.214.163:8080 A17A40775FBD2CA1184BF80BFC330A77ECF9D0E9"); +pref("extensions.torlauncher.default_bridge.fte.6", "fte 79.125.3.12:8080 272465348803EE2546A9BB8EE37D462915531F09"); // </ipv4> // <ipv6> -pref("extensions.torlauncher.default_bridge.fte.13", "fte ipv6.t5fPOQM3-1097909862.us-west-2.elb.amazonaws.com:80 6E6298B85B171FEA4E36ADB15D6FF95DA0B37C89"); +pref("extensions.torlauncher.default_bridge.fte-ipv6.1", "fte 2620:108:700f::36f5:f95b:80 6E6298B85B171FEA4E36ADB15D6FF95DA0B37C89"); +pref("extensions.torlauncher.default_bridge.fte-ipv6.2", "fte 2620:108:700f::36d6:163f:80 6E6298B85B171FEA4E36ADB15D6FF95DA0B37C89"); // </ipv6> //pref("extensions.torlauncher.default_bridge.scramblesuit.1", "scramblesuit 188.40.121.112:39707 5DE8D363D8F150C99E1A2D7237368D614838132C password=L5POGQONBPS2HZUR6GXBIDS4CMIYYOTI");

1 0

[bridgedb/develop] Merge branch 'fix/12627-hotfixes' into develop
by isis＠torproject.org 22 Jul '14

22 Jul '14

commit f8907b32eade1ecf8c40983c664c5e7c4ac2e427 Merge: 91142d6 4224107 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Jul 22 22:43:58 2014 +0000 Merge branch 'fix/12627-hotfixes' into develop lib/bridgedb/email/autoresponder.py | 35 ++++++++++++++++++----------------- lib/bridgedb/email/server.py | 2 +- 2 files changed, 19 insertions(+), 18 deletions(-)

1 0

[bridgedb/develop] Use intervalStart() in b.e.autoresponder.createResponseBody().
by isis＠torproject.org 22 Jul '14

22 Jul '14

commit 2ba3f7f912fdc45038741d1e1a1f4759ffe3ce52 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Sat Jul 19 03:14:04 2014 +0000 Use intervalStart() in b.e.autoresponder.createResponseBody(). * CHANGE `bridgedb.email.autoresponder.getResponseBody()` to use `bridgedb.schedule.intervalStart()`, not `getInterval()`. Signed-off-by: Isis Lovecruft <isis(a)torproject.org> These were part of the hotfixes to ponticum on 2014-07-16. --- lib/bridgedb/email/autoresponder.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bridgedb/email/autoresponder.py b/lib/bridgedb/email/autoresponder.py index 240818a..add1d6c 100644 --- a/lib/bridgedb/email/autoresponder.py +++ b/lib/bridgedb/email/autoresponder.py @@ -75,7 +75,7 @@ def createResponseBody(lines, context, client, lang='en'): % str(client)) # Otherwise they must have requested bridges: - interval = context.schedule.getInterval(time.time()) + interval = context.schedule.intervalStart(time.time()) bridges = context.distributor.getBridgesForEmail( str(client), interval,

1 0

[bridgedb/develop] Fix utf-8 encoding errors in email.autoresponder module.
by isis＠torproject.org 22 Jul '14

22 Jul '14

commit 29bdc8754503a2e1ead7c39b5b1207215926eee8 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Sat Jul 19 03:29:53 2014 +0000 Fix utf-8 encoding errors in email.autoresponder module. * FIXES several write errors due to encoding issues on production server. Signed-off-by: Isis Lovecruft <isis(a)torproject.org> These were part of the hotfixes to ponticum on 2014-07-16. --- lib/bridgedb/email/autoresponder.py | 18 +++++++++--------- lib/bridgedb/email/server.py | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/lib/bridgedb/email/autoresponder.py b/lib/bridgedb/email/autoresponder.py index add1d6c..e7dcdf2 100644 --- a/lib/bridgedb/email/autoresponder.py +++ b/lib/bridgedb/email/autoresponder.py @@ -136,9 +136,9 @@ def generateResponse(fromAddress, client, body, subject=None, """ response = EmailResponse(gpgContext) response.to = client - response.writeHeaders(fromAddress, str(client), subject, + response.writeHeaders(fromAddress.encode('utf-8'), str(client), subject, inReplyTo=messageID) - response.writeBody(body) + response.writeBody(body.encode('utf-8')) # Only log the email text (including all headers) if SAFE_LOGGING is # disabled: @@ -221,9 +221,9 @@ class EmailResponse(object): self.__class__.__name__)) try: if size is not None: - contents = self.mailfile.read(int(size)) + contents = self.mailfile.read(int(size)).encode('utf-8') else: - contents = self.mailfile.read() + contents = self.mailfile.read().encode('utf-8') except Exception as error: # pragma: no cover logging.exception(error) @@ -306,17 +306,17 @@ class EmailResponse(object): self.write("From: %s" % fromAddress) self.write("To: %s" % toAddress) if includeMessageID: - self.write("Message-ID: %s" % smtp.messageid()) + self.write("Message-ID: %s" % smtp.messageid().encode('utf-8')) if inReplyTo: - self.write("In-Reply-To: %s" % inReplyTo) - self.write("Content-Type: %s" % contentType) - self.write("Date: %s" % smtp.rfc822date()) + self.write("In-Reply-To: %s" % inReplyTo.encode('utf-8')) + self.write("Content-Type: %s" % contentType.encode('utf-8')) + self.write("Date: %s" % smtp.rfc822date().encode('utf-8')) if not subject: subject = '[no subject]' if not subject.lower().startswith('re'): subject = "Re: " + subject - self.write("Subject: %s" % subject) + self.write("Subject: %s" % subject.encode('utf-8')) if kwargs: for headerName, headerValue in kwargs.items(): diff --git a/lib/bridgedb/email/server.py b/lib/bridgedb/email/server.py index 1717958..4bcfed9 100644 --- a/lib/bridgedb/email/server.py +++ b/lib/bridgedb/email/server.py @@ -176,7 +176,7 @@ class SMTPMessage(object): self.lines.append(line) if not safelog.safe_logging: try: - logging.debug("> %s", line.rstrip("\r\n")) + logging.debug("> %s", line.rstrip("\r\n").encode('utf-8')) except UnicodeError: # pragma: no cover pass except Exception as error: # pragma: no cover

1 0

[bridgedb/develop] Fix an additional utf-8 encoding error for optional email headers.
by isis＠torproject.org 22 Jul '14

22 Jul '14

commit 48bb5fd6b1bf2a8e63e1dbd2b6f15b1945cf0402 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Jul 19 03:33:05 2014 +0000 Fix an additional utf-8 encoding error for optional email headers. --- lib/bridgedb/email/autoresponder.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/bridgedb/email/autoresponder.py b/lib/bridgedb/email/autoresponder.py index e7dcdf2..7e5f900 100644 --- a/lib/bridgedb/email/autoresponder.py +++ b/lib/bridgedb/email/autoresponder.py @@ -323,7 +323,8 @@ class EmailResponse(object): headerName = headerName.capitalize() headerName = headerName.replace(' ', '-') headerName = headerName.replace('_', '-') - self.write("%s: %s" % (headerName, headerValue)) + header = "%s: %s" % (headerName, headerValue) + self.write(header.encode('utf-8')) # The first blank line designates that the headers have ended: self.write(self.delimiter)

1 0

[bridgedb/develop] Revert check for SMTP/email header canonical hostname equivalence.
by isis＠torproject.org 22 Jul '14

22 Jul '14

commit 422410756a7752d6af5b881776fb107fd5e6335e Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Sat Jul 19 03:33:56 2014 +0000 Revert check for SMTP/email header canonical hostname equivalence. Signed-off-by: Isis Lovecruft <isis(a)torproject.org> For now, we need to revert this check to get the email distributor to function. We should look into this issue in order to get BridgeDB in a state where instances of it are runnable by other organisations to hand out their own bridges. [OTHER_ORG] Fixing this is essential for #12086. --- lib/bridgedb/email/autoresponder.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/bridgedb/email/autoresponder.py b/lib/bridgedb/email/autoresponder.py index 7e5f900..3674702 100644 --- a/lib/bridgedb/email/autoresponder.py +++ b/lib/bridgedb/email/autoresponder.py @@ -631,12 +631,12 @@ class SMTPAutoresponder(smtp.SMTPClient): # The canonical domains from the SMTP ``MAIL FROM:`` and the email # ``From:`` header should match: - if self.incoming.canonicalFromSMTP != self.incoming.canonicalFromEmail: - logging.error("SMTP/Email canonical domain mismatch!") - logging.debug("Canonical domain mismatch: %s != %s" - % (self.incoming.canonicalFromSMTP, - self.incoming.canonicalFromEmail)) - return False + #if self.incoming.canonicalFromSMTP != self.incoming.canonicalFromEmail: + # logging.error("SMTP/Email canonical domain mismatch!") + # logging.debug("Canonical domain mismatch: %s != %s" + # % (self.incoming.canonicalFromSMTP, + # self.incoming.canonicalFromEmail)) + # return False self.incoming.domainRules = self.incoming.context.domainRules.get( self.incoming.canonicalFromEmail, list())

1 0

[translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
by translation＠torproject.org 22 Jul '14

22 Jul '14

commit 6193d87c3be77da898cfbc32cf0769f33d19ad56 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jul 22 22:45:41 2014 +0000 Update translations for tor-launcher-network-settings --- is/network-settings.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/is/network-settings.dtd b/is/network-settings.dtd index a346274..4ae3e5e 100644 --- a/is/network-settings.dtd +++ b/is/network-settings.dtd @@ -4,8 +4,8 @@ <!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> -<!ENTITY torSettings.yes "Yes"> -<!ENTITY torSettings.no "No"> +<!ENTITY torSettings.yes "Já"> +<!ENTITY torSettings.no "Nei"> <!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> <!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied.">

1 0