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

[torbutton/master] Bug 16639: Check for Updates menu item can cause update failure.
by mikeperry＠torproject.org 27 Jul '15

27 Jul '15

commit 84497608ae13239b67d2b656647c64a70badd72c Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Thu Jul 23 15:30:51 2015 -0400 Bug 16639: Check for Updates menu item can cause update failure. Check the state of the active update (if any) and open the update prompt in the correct mode. --- src/chrome/content/torbutton.js | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 6539ea9..1d81960 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -893,9 +893,23 @@ function torbutton_notify_if_update_needed() { } function torbutton_check_for_update() { + // Open the update prompt in the correct mode. The update state + // checks used here were adapted from isPending() and isApplied() in + // Mozilla's browser/base/content/aboutDialog.js code. + let updateMgr = Cc["@mozilla.org/updates/update-manager;1"] + .getService(Ci.nsIUpdateManager); + let update = updateMgr.activeUpdate; + let updateState = (update) ? update.state : undefined; + let pendingStates = [ "pending", "pending-service", + "applied", "applied-service" ]; + let isPending = (updateState && (pendingStates.indexOf(updateState) >= 0)); + let prompter = Cc["@mozilla.org/updates/update-prompt;1"] .createInstance(Ci.nsIUpdatePrompt); - prompter.checkForUpdates(); + if (isPending) + prompter.showUpdateDownloaded(update, false); + else + prompter.checkForUpdates(); } // Pass undefined for a parameter to have this function determine it.

1 0

[tor-browser/tor-browser-38.1.0esr-5.0-1] Bug 16528: Prevent indexedDB Modernizr breakage (e10s highrisk).
by mikeperry＠torproject.org 27 Jul '15

27 Jul '15

commit 0d808cd9cf4c7efbd1391c69fae63cf40822389e Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Jul 13 13:43:18 2015 -0700 Bug 16528: Prevent indexedDB Modernizr breakage (e10s highrisk). This change should make the indexedDB failure mode for pref checks equivalent to the private browsing failure mode. Sites that use Modernizr are accustomed to the failure modes for Private Browsing usage of IndexedDB, but not for when the pref is disabled. This patch may cause serious issues with e10s in the future. We'll need to keep an eye on it for FF45. --- dom/indexedDB/ActorsParent.cpp | 1 + dom/indexedDB/IDBFactory.cpp | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dom/indexedDB/ActorsParent.cpp b/dom/indexedDB/ActorsParent.cpp index e32f9a4..ed5d8b3 100644 --- a/dom/indexedDB/ActorsParent.cpp +++ b/dom/indexedDB/ActorsParent.cpp @@ -10756,6 +10756,7 @@ FactoryOp::CheckPermission(ContentParent* aContentParent, if (aContentParent) { // The DOM in the other process should have kept us from receiving any // indexedDB messages so assume that the child is misbehaving. + // XXX: Does this happen with e10s due to Bug #16528? aContentParent->KillHard("IndexedDB CheckPermission 1"); } return NS_ERROR_DOM_INDEXEDDB_NOT_ALLOWED_ERR; diff --git a/dom/indexedDB/IDBFactory.cpp b/dom/indexedDB/IDBFactory.cpp index 2ad3ee2..8acdf0f 100644 --- a/dom/indexedDB/IDBFactory.cpp +++ b/dom/indexedDB/IDBFactory.cpp @@ -132,11 +132,13 @@ IDBFactory::CreateForWindow(nsPIDOMWindow* aWindow, nsCOMPtr<nsIPrincipal> principal; nsresult rv = AllowedForWindowInternal(aWindow, getter_AddRefs(principal)); + // XXX: Check Removed due to Bug #16528 + /* if (!(NS_SUCCEEDED(rv) && nsContentUtils::IsSystemPrincipal(principal)) && NS_WARN_IF(!Preferences::GetBool(kPrefIndexedDBEnabled, false))) { *aFactory = nullptr; return NS_ERROR_DOM_INDEXEDDB_NOT_ALLOWED_ERR; - } + } */ if (rv == NS_ERROR_DOM_NOT_SUPPORTED_ERR) { NS_WARNING("IndexedDB is not permitted in a third-party window."); @@ -265,11 +267,13 @@ IDBFactory::CreateForMainThreadJSInternal( MOZ_ASSERT(NS_IsMainThread()); MOZ_ASSERT(aPrincipalInfo); + /* XXX: Check Removed to due #16528 if (aPrincipalInfo->type() != PrincipalInfo::TSystemPrincipalInfo && NS_WARN_IF(!Preferences::GetBool(kPrefIndexedDBEnabled, false))) { *aFactory = nullptr; return NS_ERROR_DOM_INDEXEDDB_NOT_ALLOWED_ERR; } + */ IndexedDatabaseManager* mgr = IndexedDatabaseManager::GetOrCreate(); if (NS_WARN_IF(!mgr)) {

1 0

[tor-browser/tor-browser-38.1.0esr-5.0-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by mikeperry＠torproject.org 27 Jul '15

27 Jul '15

commit 41a07713072501dc23ce48f74deed464e232d07f Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Jul 27 08:49:02 2015 -0700 fixup! TB4: Tor Browser's Firefox preference overrides. Bug #16632: Turn on the background updater and be more annoying when updates are ready. --- browser/app/profile/000-tor-browser.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index aee7a83..8188855 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -4,14 +4,17 @@ // Please maintain unit tests at ./tbb-tests/browser_tor_TB4.js -// Disable browser automatic updates and associated homepage notifications -pref("app.update.auto", false); +// Disable initial homepage notifications pref("browser.search.update", false); pref("browser.rights.3.shown", true); pref("browser.startup.homepage_override.mstone", "ignore"); pref("startup.homepage_welcome_url", ""); pref("startup.homepage_override_url", ""); +// Try to nag a bit more about updates: Pop up a restart dialog an hour after the initial dialog +pref("app.update.promptWaitTime", 3600); +pref("app.update.badge", true); + // Disable "Slow startup" warnings and associated disk history // (bug #13346) pref("browser.slowStartup.notificationDisabled", true);

1 0

[tor-browser-bundle/master] Bug 16674: Allow trailing '.' in FQDNs
by mikeperry＠torproject.org 27 Jul '15

27 Jul '15

commit 3ad5030cfbdf3686defc63f4896fdd2e325ed742 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Jul 27 08:07:57 2015 -0700 Bug 16674: Allow trailing '.' in FQDNs Backport of Tor patch. --- gitian/descriptors/linux/gitian-tor.yml | 2 + gitian/descriptors/mac/gitian-tor.yml | 2 + gitian/descriptors/windows/gitian-tor.yml | 2 + gitian/patches/bug16674.patch | 74 +++++++++++++++++++++++++++++ 4 files changed, 80 insertions(+) diff --git a/gitian/descriptors/linux/gitian-tor.yml b/gitian/descriptors/linux/gitian-tor.yml index e62a1f0..bfd0e18 100644 --- a/gitian/descriptors/linux/gitian-tor.yml +++ b/gitian/descriptors/linux/gitian-tor.yml @@ -23,6 +23,7 @@ files: - "bug8405.patch" - "bug15482.patch" - "bug16430.patch" +- "bug16674.patch" - "dzip.sh" - "openssl-linux32-utils.zip" - "openssl-linux64-utils.zip" @@ -85,6 +86,7 @@ script: | else git am ~/build/bug15482.patch git am ~/build/bug16430.patch + git am ~/build/bug16674.patch fi mkdir -p $OUTDIR/src #git archive HEAD | tar -x -C $OUTDIR/src diff --git a/gitian/descriptors/mac/gitian-tor.yml b/gitian/descriptors/mac/gitian-tor.yml index d305ff7..c755851 100644 --- a/gitian/descriptors/mac/gitian-tor.yml +++ b/gitian/descriptors/mac/gitian-tor.yml @@ -19,6 +19,7 @@ files: - "bug8405.patch" - "bug15482.patch" - "bug16430.patch" +- "bug16674.patch" - "apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb" - "multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz" - "dzip.sh" @@ -63,6 +64,7 @@ script: | else git am ~/build/bug15482.patch git am ~/build/bug16430.patch + git am ~/build/bug16674.patch fi mkdir -p $OUTDIR/src #git archive HEAD | tar -x -C $OUTDIR/src diff --git a/gitian/descriptors/windows/gitian-tor.yml b/gitian/descriptors/windows/gitian-tor.yml index 22fda90..a6be6b4 100644 --- a/gitian/descriptors/windows/gitian-tor.yml +++ b/gitian/descriptors/windows/gitian-tor.yml @@ -19,6 +19,7 @@ files: - "bug8405.patch" - "bug15482.patch" - "bug16430.patch" +- "bug16674.patch" - "binutils.tar.bz2" - "dzip.sh" - "mingw-w64-win32-utils.zip" @@ -63,6 +64,7 @@ script: | else git am ~/build/bug15482.patch git am ~/build/bug16430.patch + git am ~/build/bug16674.patch fi mkdir -p $OUTDIR/src #git archive HEAD | tar -x -C $OUTDIR/src diff --git a/gitian/patches/bug16674.patch b/gitian/patches/bug16674.patch new file mode 100644 index 0000000..9497684 --- /dev/null +++ b/gitian/patches/bug16674.patch @@ -0,0 +1,74 @@ +From da6aa7bfa5014b980a93b38024d16b32720dc67a Mon Sep 17 00:00:00 2001 +From: Yawning Angel <yawning(a)schwanenlied.me> +Date: Mon, 27 Jul 2015 12:58:40 +0000 +Subject: [PATCH] Allow a single trailing `.` when validating FQDNs from SOCKS. + +URI syntax (and DNS syntax) allows for a single trailing `.` to +explicitly distinguish between a relative and absolute +(fully-qualified) domain name. While this is redundant in that RFC 1928 +DOMAINNAME addresses are *always* fully-qualified, certain clients +blindly pass the trailing `.` along in the request. + +Fixes bug 16674; bugfix on 0.2.6.2-alpha. +--- + changes/bug16674 | 5 +++++ + src/common/util.c | 6 ++++++ + src/test/test_util.c | 12 ++++++++++++ + 3 files changed, 23 insertions(+) + create mode 100644 changes/bug16674 + +diff --git a/changes/bug16674 b/changes/bug16674 +new file mode 100644 +index 0000000..de55523 +--- /dev/null ++++ b/changes/bug16674 +@@ -0,0 +1,5 @@ ++ o Minor features (client): ++ - Relax the validation done to hostnames in SOCKS5 requests, and allow ++ a single trailing '.' to cope with clients that pass FQDNs using that ++ syntax to explicitly indicate that the domain name is ++ fully-qualified. Fixes bug 16674; bugfix on 0.2.6.2-alpha. +diff --git a/src/common/util.c b/src/common/util.c +index 618e6a1..1aac4fc 100644 +--- a/src/common/util.c ++++ b/src/common/util.c +@@ -1056,6 +1056,12 @@ string_is_valid_hostname(const char *string) + break; + } + ++ /* Allow a single terminating '.' used rarely to indicate domains ++ * are FQDNs rather than relative. */ ++ if ((c_sl_idx > 0) && (c_sl_idx + 1 == c_sl_len) && !*c) { ++ continue; ++ } ++ + do { + if ((*c >= 'a' && *c <= 'z') || + (*c >= 'A' && *c <= 'Z') || +diff --git a/src/test/test_util.c b/src/test/test_util.c +index 0f64c26..2bffb17 100644 +--- a/src/test/test_util.c ++++ b/src/test/test_util.c +@@ -4285,7 +4285,19 @@ test_util_hostname_validation(void *arg) + // comply with a ~30 year old standard. + tt_assert(string_is_valid_hostname("core3_euw1.fabrik.nytimes.com")); + ++ // Firefox passes FQDNs with trailing '.'s directly to the SOCKS proxy, ++ // which is redundant since the spec states DOMAINNAME addresses are fully ++ // qualified. While unusual, this should be tollerated. ++ tt_assert(string_is_valid_hostname("core9_euw1.fabrik.nytimes.com.")); ++ tt_assert(!string_is_valid_hostname("..washingtonpost.is.better.com")); ++ tt_assert(!string_is_valid_hostname("so.is..ft.com")); ++ tt_assert(!string_is_valid_hostname("...")); ++ + // XXX: do we allow single-label DNS names? ++ // We shouldn't for SOCKS (spec says "contains a fully-qualified domain name" ++ // but only test pathologically malformed traling '.' cases for now. ++ tt_assert(!string_is_valid_hostname(".")); ++ tt_assert(!string_is_valid_hostname("..")); + + done: + return; +-- +1.9.1 +

1 0

[tor/master] Fold final entries into changelog
by nickm＠torproject.org 27 Jul '15

27 Jul '15

commit 36c0ae6f7834af16c379ac399edf7af514cafbb5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 27 10:53:09 2015 -0400 Fold final entries into changelog --- ChangeLog | 33 +++++++++++++++++++++++++++------ changes/bug16162 | 5 ----- changes/bug16631 | 4 ---- changes/bug16674 | 5 ----- changes/ticket2325 | 7 ------- 5 files changed, 27 insertions(+), 27 deletions(-) diff --git a/ChangeLog b/ChangeLog index d4c4d71..8329bf0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,9 +1,10 @@ -Changes in version 0.2.7.2-alpha - 2015-07-27 - This, the second alpha in the Tor 0.2.7 series, has a number of new - features, including a way to manually pick the number of introduction - points for hidden services, and the much stronger Ed25519 signing key - algorithm for regular Tor relays (including support for encrypted - offline identity keys in the new algorithm). +None + Changes in version 0.2.7.2-alpha - 2015-07-27 This, the second alpha + in the Tor 0.2.7 series, has a number of new features, including a way + to manually pick the number of introduction points for hidden + services, and the much stronger Ed25519 signing key algorithm for + regular Tor relays (including support for encrypted offline identity + keys in the new algorithm). Support for Ed25519 on relays is currently limited to signing router descriptors; later alphas in this series will extend Ed25519 key @@ -112,6 +113,10 @@ Changes in version 0.2.7.2-alpha - 2015-07-27 character '_' to appear, in order to cope with domains observed in the wild that are serving non-RFC compliant records. Resolves ticket 16430. + - Relax the validation done to hostnames in SOCKS5 requests, and + allow a single trailing '.' to cope with clients that pass FQDNs + using that syntax to explicitly indicate that the domain name is + fully-qualified. Fixes bug 16674; bugfix on 0.2.6.2-alpha. - Add GroupWritable and WorldWritable options to unix-socket based SocksPort and ControlPort options. These options apply to a single socket, and override {Control,Socks}SocketsGroupWritable. Closes @@ -187,9 +192,17 @@ Changes in version 0.2.7.2-alpha - 2015-07-27 code. Fixes bug 16212; bugfix on 0.2.6.2-alpha. Patch by Peter Palfrader. + o Minor bugfixes (relay): + - Fix a rarely-encountered memory leak when failing to initialize + the thread pool. Fixes bug 16631; bugfix on 0.2.6.3-alpha. Patch + from "cypherpunks". + o Minor bugfixes (systemd): - Fix an accidental formatting error that broke the systemd configuration file. Fixes bug 16152; bugfix on 0.2.7.1-alpha. + - Tor's systemd unit file no longer contains extraneous spaces. + These spaces would sometimes confuse tools like deb-systemd- + helper. Fixes bug 16162; bugfix on 0.2.5.5-alpha. o Minor bugfixes (tests): - Use the configured Python executable when running test-stem-full. @@ -219,6 +232,14 @@ Changes in version 0.2.7.2-alpha - 2015-07-27 "trunnel" binary encoding generator, to reduce the risk of bugs due to programmer error. Done as part of ticket 12498. + o Documentation: + - Include a specific and (hopefully) accurate documentation of the + torrc file's meta-format in doc/torrc_format.txt. This is mainly + of interest to people writing programs to parse or generate torrc + files. This document is not a commitment to long-term + compatibility; some aspects of the current format are a bit + ridiculous. Closes ticket 2325. + o Removed features: - Tor no longer supports copies of OpenSSL that are missing support for Elliptic Curve Cryptography. (We began using ECC when diff --git a/changes/bug16162 b/changes/bug16162 deleted file mode 100644 index 3732424..0000000 --- a/changes/bug16162 +++ /dev/null @@ -1,5 +0,0 @@ - - o Minor bugfixes (systemd): - - Tor's systemd unit file no longer contains extraneous spaces. - These spaces would sometimes confuse tools like deb-systemd-helper. - Fixes bug 16162; bugfix on 0.2.5.5-alpha. diff --git a/changes/bug16631 b/changes/bug16631 deleted file mode 100644 index 24c5747..0000000 --- a/changes/bug16631 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor bugfixes (relay): - - Fix a rarely-encountered memory leak when failing to initialize - the thread pool. Fixes bug 16631; bugfix on 0.2.6.3-alpha. Patch - from "cypherpunks". diff --git a/changes/bug16674 b/changes/bug16674 deleted file mode 100644 index de55523..0000000 --- a/changes/bug16674 +++ /dev/null @@ -1,5 +0,0 @@ - o Minor features (client): - - Relax the validation done to hostnames in SOCKS5 requests, and allow - a single trailing '.' to cope with clients that pass FQDNs using that - syntax to explicitly indicate that the domain name is - fully-qualified. Fixes bug 16674; bugfix on 0.2.6.2-alpha. diff --git a/changes/ticket2325 b/changes/ticket2325 deleted file mode 100644 index b96e514..0000000 --- a/changes/ticket2325 +++ /dev/null @@ -1,7 +0,0 @@ - o Documentation: - - Include a specific and (hopefully) accurate documentation of the torrc - file's meta-format in doc/torrc_format.txt. This is mainly of - interest to people writing programs to parse or generate torrc files. - This document is not a commitment to long-term compatibility; - some aspects of the current format are a bit ridiculous. - Closes ticket 2325.

1 0

[translation/tor-messenger-ircproperties_completed] Update translations for tor-messenger-ircproperties_completed
by translation＠torproject.org 27 Jul '15

27 Jul '15

commit 19b56e2c936363bc089c96d6f022e19793357375 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jul 27 14:16:29 2015 +0000 Update translations for tor-messenger-ircproperties_completed --- fr_CA/irc.properties | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/fr_CA/irc.properties b/fr_CA/irc.properties index 72d4aba..74db24e 100644 --- a/fr_CA/irc.properties +++ b/fr_CA/irc.properties @@ -79,14 +79,14 @@ command.whois2=%S [<pseudo>] : obtenir les informations d'un utilisateur. # LOCALIZATION NOTE (message.*): # These are shown as system messages in the conversation. # %1$S is the nick and %2$S is the nick and host of the user who joined. -message.join=%1$S [%2$S] est entré dans le salon. -message.rejoined=Vous êtes connecté au salon. +message.join=%1$S [%2$S] est entré dans le clavardoir. +message.rejoined=Vous êtes connecté au clavardoir. # %1$S is the nick of who kicked you. # %2$S is message.kicked.reason, if a kick message was given. -message.kicked.you=Vous avez été écarté par %1$S%2$S. +message.kicked.you=Vous avez été sorti de force par %1$S%2$S. # %1$S is the nick that is kicked, %2$S the nick of the person who kicked # %1$S. %3$S is message.kicked.reason, if a kick message was given. -message.kicked=%1$S a été écarté par %2$S%3$S. +message.kicked=%1$S a été sorti de force par %2$S%3$S. # %S is the kick message message.kicked.reason=: %S # %1$S is the new mode, %2$S is the nickname of the user whose mode @@ -99,13 +99,13 @@ message.yourmode=Votre mode est %S. # Could not change the nickname. %S is the user's nick. message.nick.fail=Impossible d'utiliser le pseudonyme souhaité. Votre pseudo reste %S. # The parameter is the message.parted.reason, if a part message is given. -message.parted.you=Vous avez quitté le salon (Part%1$S). +message.parted.you=Vous avez quitté le clavardoir (Part%1$S). # %1$S is the user's nick, %2$S is message.parted.reason, if a part message is given. -message.parted=%1$S a quitté le salon (Part%2$S). +message.parted=%1$S a quitté le clavardoir (Part%2$S). # %S is the part message supplied by the user. message.parted.reason=: %S # %1$S is the user's nick, %2$S is message.quit2 if a quit message is given. -message.quit=%1$S a quitté le salon (Quit%2$S). +message.quit=%1$S a quitté le clavardoir (Quit%2$S). # The parameter is the quit message given by the user. message.quit2=: %S # %1$S is the nickname of the user that invited us, %2$S is the conversation @@ -118,7 +118,7 @@ message.invited=%1$S a été invité à %2$S avec succès. # they were invited to but are already in message.alreadyInChannel=%1$S est déjà dans %2$S. # %S is the nickname of the user who was summoned. -message.summoned=%S a été appelé +message.summoned=On a demandé à %S de se joindre. # %S is the nickname of the user whose WHOIS information follows this message. message.whois=Informations WHOIS pour %S : # %1$S is the nickname of the (offline) user whose WHOWAS information follows this message.

1 0

[translation/tor-messenger-ircproperties] Update translations for tor-messenger-ircproperties
by translation＠torproject.org 27 Jul '15

27 Jul '15

commit db06cdf9f4a0c11b346c9b47e39a46b77955a4e2 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jul 27 14:16:26 2015 +0000 Update translations for tor-messenger-ircproperties --- fr_CA/irc.properties | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/fr_CA/irc.properties b/fr_CA/irc.properties index 72d4aba..74db24e 100644 --- a/fr_CA/irc.properties +++ b/fr_CA/irc.properties @@ -79,14 +79,14 @@ command.whois2=%S [<pseudo>] : obtenir les informations d'un utilisateur. # LOCALIZATION NOTE (message.*): # These are shown as system messages in the conversation. # %1$S is the nick and %2$S is the nick and host of the user who joined. -message.join=%1$S [%2$S] est entré dans le salon. -message.rejoined=Vous êtes connecté au salon. +message.join=%1$S [%2$S] est entré dans le clavardoir. +message.rejoined=Vous êtes connecté au clavardoir. # %1$S is the nick of who kicked you. # %2$S is message.kicked.reason, if a kick message was given. -message.kicked.you=Vous avez été écarté par %1$S%2$S. +message.kicked.you=Vous avez été sorti de force par %1$S%2$S. # %1$S is the nick that is kicked, %2$S the nick of the person who kicked # %1$S. %3$S is message.kicked.reason, if a kick message was given. -message.kicked=%1$S a été écarté par %2$S%3$S. +message.kicked=%1$S a été sorti de force par %2$S%3$S. # %S is the kick message message.kicked.reason=: %S # %1$S is the new mode, %2$S is the nickname of the user whose mode @@ -99,13 +99,13 @@ message.yourmode=Votre mode est %S. # Could not change the nickname. %S is the user's nick. message.nick.fail=Impossible d'utiliser le pseudonyme souhaité. Votre pseudo reste %S. # The parameter is the message.parted.reason, if a part message is given. -message.parted.you=Vous avez quitté le salon (Part%1$S). +message.parted.you=Vous avez quitté le clavardoir (Part%1$S). # %1$S is the user's nick, %2$S is message.parted.reason, if a part message is given. -message.parted=%1$S a quitté le salon (Part%2$S). +message.parted=%1$S a quitté le clavardoir (Part%2$S). # %S is the part message supplied by the user. message.parted.reason=: %S # %1$S is the user's nick, %2$S is message.quit2 if a quit message is given. -message.quit=%1$S a quitté le salon (Quit%2$S). +message.quit=%1$S a quitté le clavardoir (Quit%2$S). # The parameter is the quit message given by the user. message.quit2=: %S # %1$S is the nickname of the user that invited us, %2$S is the conversation @@ -118,7 +118,7 @@ message.invited=%1$S a été invité à %2$S avec succès. # they were invited to but are already in message.alreadyInChannel=%1$S est déjà dans %2$S. # %S is the nickname of the user who was summoned. -message.summoned=%S a été appelé +message.summoned=On a demandé à %S de se joindre. # %S is the nickname of the user whose WHOIS information follows this message. message.whois=Informations WHOIS pour %S : # %1$S is the nickname of the (offline) user whose WHOWAS information follows this message.

1 0

[tor-commits] [translation/tor-messenger-conversationsproperties_completed] Update translations for tor-messenger-conversationsproperties_completed
by translation＠torproject.org 27 Jul '15

27 Jul '15

commit 444ea6c0c05c443c7a5e5283dfa1a326c3828230 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jul 27 14:16:16 2015 +0000 Update translations for tor-messenger-conversationsproperties_completed --- fr_CA/conversations.properties | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/fr_CA/conversations.properties b/fr_CA/conversations.properties index 008405e..05a78ab 100644 --- a/fr_CA/conversations.properties +++ b/fr_CA/conversations.properties @@ -41,7 +41,7 @@ autoReply=Réponse automatique - %S # LOCALIZATION NOTE (noTopic): # Displayed instead of the topic when no topic is set. -noTopic=Aucun message de sujet pour ce salon. +noTopic=Aucun message de sujet pour ce clavardoir # LOCALIZATION NOTE (topicSet): # %1$S is the conversation name, %2$S is the topic. @@ -56,6 +56,17 @@ topicChanged=%1$S a changé le sujet en : %2$S. # %1$S is the user who cleared the topic. topicCleared=%1$S a effacé le sujet. +# LOCALIZATION NOTE (nickSet): +# This is displayed as a system message when a participant changes his/her +# nickname in a conversation. +# %1$S is the old nick. +# %2$S is the new nick. +nickSet=%1$S est maintenant connu en tant que %2$S. +# LOCALIZATION NOTE (nickSet.you): +# This is displayed as a system message when your nickname is changed. +# %S is your new nick. +nickSet.you=Vous êtes maintenant connu en tant que %S. + # LOCALIZATION NOTE (messenger.conversations.selections.ellipsis): # ellipsis is used when copying a part of a message to show that the message was cut messenger.conversations.selections.ellipsis=[…]

1 0

[translation/tor-messenger-conversationsproperties] Update translations for tor-messenger-conversationsproperties
by translation＠torproject.org 27 Jul '15

27 Jul '15

commit e8dbf5fda6ee7a3262fecc14f0aa10bf0ab05524 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jul 27 14:16:11 2015 +0000 Update translations for tor-messenger-conversationsproperties --- fr_CA/conversations.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fr_CA/conversations.properties b/fr_CA/conversations.properties index 3ac1f0a..05a78ab 100644 --- a/fr_CA/conversations.properties +++ b/fr_CA/conversations.properties @@ -41,7 +41,7 @@ autoReply=Réponse automatique - %S # LOCALIZATION NOTE (noTopic): # Displayed instead of the topic when no topic is set. -noTopic=Aucun message de sujet pour ce salon. +noTopic=Aucun message de sujet pour ce clavardoir # LOCALIZATION NOTE (topicSet): # %1$S is the conversation name, %2$S is the topic. @@ -61,11 +61,11 @@ topicCleared=%1$S a effacé le sujet. # nickname in a conversation. # %1$S is the old nick. # %2$S is the new nick. -nickSet=%1$S is now known as %2$S. +nickSet=%1$S est maintenant connu en tant que %2$S. # LOCALIZATION NOTE (nickSet.you): # This is displayed as a system message when your nickname is changed. # %S is your new nick. -nickSet.you=You are now known as %S. +nickSet.you=Vous êtes maintenant connu en tant que %S. # LOCALIZATION NOTE (messenger.conversations.selections.ellipsis): # ellipsis is used when copying a part of a message to show that the message was cut

1 0

[ooni-probe/master] Add meek test default inputs
by art＠torproject.org 27 Jul '15

27 Jul '15

commit 46ea4280cc97eba726650d08b73c1edb18074d59 Author: anadahz <kojgelo(a)inbox.com> Date: Fri Apr 17 01:40:23 2015 +0200 Add meek test default inputs The default inputs (domain name and host header) combinations needed to reach the meek servers. Without any parameters the test will use these default inputs. --- ooni/nettests/blocking/meek_fronted_requests.py | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/ooni/nettests/blocking/meek_fronted_requests.py b/ooni/nettests/blocking/meek_fronted_requests.py index 6e3cb7a..762e27e 100644 --- a/ooni/nettests/blocking/meek_fronted_requests.py +++ b/ooni/nettests/blocking/meek_fronted_requests.py @@ -23,11 +23,10 @@ class meekTest(httpt.HTTPTest): and response with: "I’m just a happy little web server.\n". The input file should be formatted as (one per line): "DomainName:HostHeader" - - Some default meek DomainName and HostHeader combinations: www.google.com:meek-reflect.appspot.com ajax.aspnetcdn.com:az668014.vo.msecnd.net a0.awsstatic.com:d2zfqthxsdq309.cloudfront.net + """ name = "meek fronted requests test" version = "0.0.1" @@ -36,6 +35,9 @@ class meekTest(httpt.HTTPTest): inputFile = ['file', 'f', None, "File containing the DomainName:HostHeader combinations to\ be tested, one per line."] + inputs = [('www.google.com', 'meek-reflect.appspot.com'), + ('ajax.aspnetcdn.com', 'az668014.vo.msecnd.net'), + ('a0.awsstatic.com', 'd2zfqthxsdq309.cloudfront.net')] requiresRoot = False requiresTor = False @@ -44,14 +46,16 @@ class meekTest(httpt.HTTPTest): """ Check for inputs. """ + if self.input: - self.DomainName, self.header = self.input.split(':') + if (isinstance(self.input, tuple) or isinstace(self.input, list)): + self.DomainName, self.header = self.input + else: + self.DomainName, self.header = self.input.split(':') elif (self.localOptions['DomainName'] and self.localOptions['HostHeader']): self.DomainName = self.localOptions['DomainName'] self.header = self.localOptions['HostHeader'] - else: - raise Exception("No input specified") self.ExpectedBody = self.localOptions['ExpectedBody'] self.DomainName = 'https://' + self.DomainName @@ -72,3 +76,4 @@ class meekTest(httpt.HTTPTest): headers['Host'] = [self.header] return self.doRequest(self.DomainName, method="GET", headers=headers, body_processor=process_body) +

1 0