[tor-commits] [tor-browser/tor-browser-60.1.0esr-8.0-1] Bug 26825 - Delete RECEIVE_BOOT_COMPLETED permission
commit a67072ef19806e4c4c5d4a0c10f5cb35b5da2de1 Author: Matthew Finkel Date: Fri Aug 3 21:16:43 2018 + Bug 26825 - Delete RECEIVE_BOOT_COMPLETED permission This permission is not needed and it is only used by the Stumbler (which we exclude at compile-time). --- mobile/android/base/FennecManifest_permissions.xml.in | 1 - mobile/android/geckoview/src/main/AndroidManifest.xml | 1 - 2 files changed, 2 deletions(-) diff --git a/mobile/android/base/FennecManifest_permissions.xml.in b/mobile/android/base/FennecManifest_permissions.xml.in index f7bfe475bece..08c611d0a290 100644 --- a/mobile/android/base/FennecManifest_permissions.xml.in +++ b/mobile/android/base/FennecManifest_permissions.xml.in @@ -25,7 +25,6 @@ #endif - diff --git a/mobile/android/geckoview/src/main/AndroidManifest.xml b/mobile/android/geckoview/src/main/AndroidManifest.xml index da1508336d90..9a74f5843240 100644 --- a/mobile/android/geckoview/src/main/AndroidManifest.xml +++ b/mobile/android/geckoview/src/main/AndroidManifest.xml @@ -9,7 +9,6 @@ #endif - ___ 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-60.1.0esr-8.0-1] Bug 24056: Use en-US strings in HTML forms
commit cbb04b72c68272c2de42f157d40cd7d29a6b7b55
Author: Arthur Edelstein
Date: Mon Aug 6 13:20:40 2018 -0700
Bug 24056: Use en-US strings in HTML forms
When privacy.spoof_english = 2, we should hide the user's
locale in content. So we use en-US default strings for HTML
form elements, such as a Submit button.
We also force GetLocalizedEllipsis() to always return the
ellipsis used by en-US.
---
dom/base/nsContentUtils.cpp | 32 +---
dom/base/nsContentUtils.h | 3 +++
2 files changed, 28 insertions(+), 7 deletions(-)
diff --git a/dom/base/nsContentUtils.cpp b/dom/base/nsContentUtils.cpp
index 8257283e65a2..645f4aee0909 100644
--- a/dom/base/nsContentUtils.cpp
+++ b/dom/base/nsContentUtils.cpp
@@ -317,6 +317,8 @@ bool nsContentUtils::sIsBytecodeCacheEnabled = false;
int32_t nsContentUtils::sBytecodeCacheStrategy = 0;
nsCString* nsContentUtils::sJSBytecodeMimeType = nullptr;
+int32_t nsContentUtils::sSpoofEnglish = 0;
+
int32_t nsContentUtils::sPrivacyMaxInnerWidth = 1000;
int32_t nsContentUtils::sPrivacyMaxInnerHeight = 1000;
@@ -737,6 +739,9 @@ nsContentUtils::Init()
Preferences::AddIntVarCache(&sBytecodeCacheStrategy,
"dom.script_loader.bytecode_cache.strategy", 0);
+ Preferences::AddIntVarCache(&sSpoofEnglish,
+ "privacy.spoof_english", 0);
+
nsDependentCString buildID(mozilla::PlatformBuildID());
sJSBytecodeMimeType = new
nsCString(NS_LITERAL_CSTRING("javascript/moz-bytecode-") + buildID);
@@ -4040,7 +4045,7 @@ nsContentUtils::GetEventArgNames(int32_t aNameSpaceID,
}
}
-static const char gPropertiesFiles[nsContentUtils::PropertiesFile_COUNT][56] =
{
+static const char* gPropertiesFiles[nsContentUtils::PropertiesFile_COUNT] = {
// Must line up with the enum values in |PropertiesFile| enum.
"chrome://global/locale/css.properties",
"chrome://global/locale/xbl.properties",
@@ -4055,7 +4060,8 @@ static const char
gPropertiesFiles[nsContentUtils::PropertiesFile_COUNT][56] = {
"chrome://global/locale/commonDialogs.properties",
"chrome://global/locale/mathml/mathml.properties",
"chrome://global/locale/security/security.properties",
- "chrome://necko/locale/necko.properties"
+ "chrome://necko/locale/necko.properties",
+ "resource://gre/chrome/en-US/locale/en-US/global/layout/HtmlForm.properties"
};
/* static */ nsresult
@@ -4098,6 +4104,11 @@ nsresult
nsContentUtils::GetLocalizedString(PropertiesFile aFile,
const char* aKey,
nsAString& aResult)
{
+ // When we spoof English, use en-US default strings in HTML forms.
+ if (aFile == eFORMS_PROPERTIES && sSpoofEnglish == 2) {
+aFile = eFORMS_PROPERTIES_en_US;
+ }
+
nsresult rv = EnsureStringBundle(aFile);
NS_ENSURE_SUCCESS(rv, rv);
nsIStringBundle *bundle = sStringBundles[aFile];
@@ -4111,6 +4122,11 @@ nsresult
nsContentUtils::FormatLocalizedString(PropertiesFile aFile,
uint32_t aParamsLength,
nsAString& aResult)
{
+ // When we spoof English, use en-US default strings in HTML forms.
+ if (aFile == eFORMS_PROPERTIES && sSpoofEnglish == 2) {
+aFile = eFORMS_PROPERTIES_en_US;
+ }
+
nsresult rv = EnsureStringBundle(aFile);
NS_ENSURE_SUCCESS(rv, rv);
nsIStringBundle *bundle = sStringBundles[aFile];
@@ -5722,11 +5738,13 @@ nsContentUtils::GetLocalizedEllipsis()
{
static char16_t sBuf[4] = { 0, 0, 0, 0 };
if (!sBuf[0]) {
-nsAutoString tmp;
-Preferences::GetLocalizedString("intl.ellipsis", tmp);
-uint32_t len = std::min(uint32_t(tmp.Length()),
- uint32_t(ArrayLength(sBuf) - 1));
-CopyUnicodeTo(tmp, 0, sBuf, len);
+if (sSpoofEnglish != 2) {
+ nsAutoString tmp;
+ Preferences::GetLocalizedString("intl.ellipsis", tmp);
+ uint32_t len = std::min(uint32_t(tmp.Length()),
+ uint32_t(ArrayLength(sBuf) - 1));
+ CopyUnicodeTo(tmp, 0, sBuf, len);
+}
if (!sBuf[0])
sBuf[0] = char16_t(0x2026);
}
diff --git a/dom/base/nsContentUtils.h b/dom/base/nsContentUtils.h
index 246dabf340de..135dafdbc052 100644
--- a/dom/base/nsContentUtils.h
+++ b/dom/base/nsContentUtils.h
@@ -1110,6 +1110,7 @@ public:
eMATHML_PROPERTIES,
eSECURITY_PROPERTIES,
eNECKO_PROPERTIES,
+eFORMS_PROPERTIES_en_US,
PropertiesFile_COUNT
};
static nsresult ReportToConsole(uint32_t aErrorFlags,
@@ -3514,6 +3515,8 @@ private:
static int32_t sInnerOrOuterWindowCount;
static uint32_t sInnerOrOuterWindowSerialCounter;
+
+ static int32_t sSpoofEnglish;
};
/* static */ inline
___
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-60.1.0esr-8.0-1] squash! Bug 21431: Clean-up system extensions shipped in Firefox 52
commit 1c7d5ff5c2982f6ba67e2e7cf80398b147c7182e
Author: Kathy Brade
Date: Wed Aug 1 11:38:10 2018 -0400
squash! Bug 21431: Clean-up system extensions shipped in Firefox 52
Ship the onboarding system extension.
---
browser/app/Makefile.in | 2 +-
browser/extensions/moz.build | 1 +
browser/installer/package-manifest.in | 3 +--
browser/locales/Makefile.in | 1 +
browser/locales/jar.mn| 4 ++--
5 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in
index d3ff94f2aa13..c2dc3ace199d 100644
--- a/browser/app/Makefile.in
+++ b/browser/app/Makefile.in
@@ -109,4 +109,4 @@ endif
.PHONY: features
tools features::
- $(PYTHON) -c 'import os, json; listing = {"system":
sorted(os.listdir("$(DIST)/bin/browser/features")) if
os.path.exists("$(DIST)/bin/browser/features") else []}; print
json.dumps(listing)' >
$(DIST)/bin/browser/chrome/browser/content/browser/built_in_addons.json
+ $(PYTHON) -c 'import os, json; listing = {"system":
sorted(os.listdir("$(DIST)/bin/browser/features"))}; print json.dumps(listing)'
> $(DIST)/bin/browser/chrome/browser/content/browser/built_in_addons.json
diff --git a/browser/extensions/moz.build b/browser/extensions/moz.build
index 003619df13e3..a23ecc6bf5fa 100644
--- a/browser/extensions/moz.build
+++ b/browser/extensions/moz.build
@@ -5,5 +5,6 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
DIRS += [
+'onboarding',
'pdfjs',
]
diff --git a/browser/installer/package-manifest.in
b/browser/installer/package-manifest.in
index d71a76cf608a..7c89a4f70b95 100644
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -605,8 +605,7 @@
@RESPATH@/browser/chrome/icons/default/default64.png
@RESPATH@/browser/chrome/icons/default/default128.png
#endif
-; In Tor Browser, the browser/features directory is missing (no system
extensions).
-;@RESPATH@/browser/features/*
+@RESPATH@/browser/features/*
; [Webide Files]
@RESPATH@/browser/chrome/webide@JAREXT@
diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in
index 5989e231b322..e67b2b08a795 100644
--- a/browser/locales/Makefile.in
+++ b/browser/locales/Makefile.in
@@ -74,6 +74,7 @@ libs-%:
@$(MAKE) -C ../../toolkit/locales libs-$*
XPI_ROOT_APPID='$(XPI_ROOT_APPID)'
@$(MAKE) -C ../../services/sync/locales AB_CD=$* XPI_NAME=locale-$*
@$(MAKE) -C ../../extensions/spellcheck/locales AB_CD=$*
XPI_NAME=locale-$*
+ @$(MAKE) -C ../extensions/onboarding/locales AB_CD=$* XPI_NAME=locale-$*
@$(MAKE) -C ../../devtools/client/locales AB_CD=$* XPI_NAME=locale-$*
XPI_ROOT_APPID='$(XPI_ROOT_APPID)'
@$(MAKE) -C ../../devtools/shim/locales AB_CD=$* XPI_NAME=locale-$*
XPI_ROOT_APPID='$(XPI_ROOT_APPID)'
@$(MAKE) -B searchplugins AB_CD=$* XPI_NAME=locale-$*
diff --git a/browser/locales/jar.mn b/browser/locales/jar.mn
index 560aa8f098b3..5472a9c946b0 100644
--- a/browser/locales/jar.mn
+++ b/browser/locales/jar.mn
@@ -113,6 +113,6 @@
#ifdef XPI_NAME
# Bug 1240628, restructure how l10n repacks work with feature addons
# This is hacky, but ensures the chrome.manifest chain is complete
-#[.] chrome.jar:
-#% manifest features/chrome.manifest
+[.] chrome.jar:
+% manifest features/chrome.manifest
#endif
___
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-60.1.0esr-8.0-1] fixup! TB4: Tor Browser's Firefox preference overrides.
commit fa471b46da2a188f02d2e120fd5822aee818
Author: Kathy Brade
Date: Wed Aug 8 10:55:44 2018 -0400
fixup! TB4: Tor Browser's Firefox preference overrides.
---
browser/app/profile/000-tor-browser.js | 3 ---
1 file changed, 3 deletions(-)
diff --git a/browser/app/profile/000-tor-browser.js
b/browser/app/profile/000-tor-browser.js
index e87b38dcb775..2ae1f416f89f 100644
--- a/browser/app/profile/000-tor-browser.js
+++ b/browser/app/profile/000-tor-browser.js
@@ -97,9 +97,6 @@ pref("toolkit.telemetry.unified", false);
pref("toolkit.telemetry.enabled", false);
// No experiments, use Tor Browser. See 21797.
pref("experiments.enabled", false);
-// Disable the UITour backend so there is no chance that a remote page
-// can use it to confuse Tor Browser users.
-pref("browser.uitour.enabled", false);
pref("browser.syncPromoViewsLeftMap", "{\"addons\":0, \"passwords\":0,
\"bookmarks\":0}"); // Don't promote sync
pref("identity.fxaccounts.enabled", false); // Disable sync by default
pref("services.sync.engine.prefs", false); // Never sync prefs, addons, or
tabs with other browsers
___
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-60.1.0esr-8.0-1] Bug 27082: enable a limited UITour
commit 99042436bbdae4d849902ddf49bb5e89311a5121
Author: Kathy Brade
Date: Wed Aug 8 11:34:40 2018 -0400
Bug 27082: enable a limited UITour
Disallow access to UITour functionality from all pages other than
about:home, about:newtab, and about:tor.
Implement a whitelist mechanism for page actions.
---
browser/app/permissions | 6 +-
browser/components/uitour/UITour.jsm| 13 ++---
browser/components/uitour/content-UITour.js | 25 ++---
3 files changed, 13 insertions(+), 31 deletions(-)
diff --git a/browser/app/permissions b/browser/app/permissions
index bda2a9f4e1db..b4b166c755ae 100644
--- a/browser/app/permissions
+++ b/browser/app/permissions
@@ -7,13 +7,9 @@
# See nsPermissionManager.cpp for more...
# UITour
-origin uitour 1 https://www.mozilla.org
-origin uitour 1 https://screenshots.firefox.com
-origin uitour 1 https://support.mozilla.org
-origin uitour 1 https://addons.mozilla.org
-origin uitour 1 https://discovery.addons.mozilla.org
origin uitour 1 about:home
origin uitour 1 about:newtab
+origin uitour 1 about:tor
# XPInstall
origin install 1 https://addons.mozilla.org
diff --git a/browser/components/uitour/UITour.jsm
b/browser/components/uitour/UITour.jsm
index 136bd6db78b7..fcce372db422 100644
--- a/browser/components/uitour/UITour.jsm
+++ b/browser/components/uitour/UITour.jsm
@@ -41,6 +41,10 @@ ChromeUtils.defineModuleGetter(this, "UpdateUtils",
const PREF_LOG_LEVEL = "browser.uitour.loglevel";
const PREF_SEENPAGEIDS= "browser.uitour.seenPageIDs";
+const TOR_BROWSER_PAGE_ACTIONS_ALLOWED = new Set([
+ // Add page actions used by Tor Browser's new user/feature onboarding here.
+]);
+
const BACKGROUND_PAGE_ACTIONS_ALLOWED = new Set([
"forceShowReaderIcon",
"getConfiguration",
@@ -376,6 +380,11 @@ var UITour = {
return false;
}
+if (!TOR_BROWSER_PAGE_ACTIONS_ALLOWED.has(action)) {
+ log.warn("Ignoring disallowed action:", action);
+ return false;
+}
+
switch (action) {
case "registerPageID": {
if (typeof data.pageID != "string") {
@@ -930,9 +939,7 @@ var UITour = {
// This function is copied to UITourListener.
isSafeScheme(aURI) {
-let allowedSchemes = new Set(["https", "about"]);
-if (!Services.prefs.getBoolPref("browser.uitour.requireSecure"))
- allowedSchemes.add("http");
+let allowedSchemes = new Set(["about"]);
if (!allowedSchemes.has(aURI.scheme)) {
log.error("Unsafe scheme:", aURI.scheme);
diff --git a/browser/components/uitour/content-UITour.js
b/browser/components/uitour/content-UITour.js
index 100aa4dc2255..be51b8383d6b 100644
--- a/browser/components/uitour/content-UITour.js
+++ b/browser/components/uitour/content-UITour.js
@@ -26,30 +26,9 @@ var UITourListener = {
});
},
- isTestingOrigin(aURI) {
-if (Services.prefs.getPrefType(PREF_TEST_WHITELIST) !=
Services.prefs.PREF_STRING) {
- return false;
-}
-
-// Add any testing origins (comma-seperated) to the whitelist for the
session.
-for (let origin of
Services.prefs.getCharPref(PREF_TEST_WHITELIST).split(",")) {
- try {
-let testingURI = Services.io.newURI(origin);
-if (aURI.prePath == testingURI.prePath) {
- return true;
-}
- } catch (ex) {
-Cu.reportError(ex);
- }
-}
-return false;
- },
-
// This function is copied from UITour.jsm.
isSafeScheme(aURI) {
-let allowedSchemes = new Set(["https", "about"]);
-if (!Services.prefs.getBoolPref("browser.uitour.requireSecure"))
- allowedSchemes.add("http");
+let allowedSchemes = new Set(["about"]);
if (!allowedSchemes.has(aURI.scheme))
return false;
@@ -73,7 +52,7 @@ var UITourListener = {
if (permission == Services.perms.ALLOW_ACTION)
return true;
-return this.isTestingOrigin(uri);
+return false;
},
receiveMessage(aMessage) {
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/abouttor-homepage] Update translations for abouttor-homepage
commit 7a05d2b00296234ecc0f94cff5313775305596c5 Author: Translation commit bot Date: Wed Aug 15 19:15:04 2018 + Update translations for abouttor-homepage --- es/aboutTor.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/es/aboutTor.dtd b/es/aboutTor.dtd index 680fc4c5d..2c7494e71 100644 --- a/es/aboutTor.dtd +++ b/es/aboutTor.dtd @@ -7,7 +7,7 @@ - + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/abouttor-homepage_completed] Update translations for abouttor-homepage_completed
commit c1006ae47ef4905d9c438002b36df23748ba40fb Author: Translation commit bot Date: Wed Aug 15 19:15:09 2018 + Update translations for abouttor-homepage_completed --- es/aboutTor.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/es/aboutTor.dtd b/es/aboutTor.dtd index 680fc4c5d..2c7494e71 100644 --- a/es/aboutTor.dtd +++ b/es/aboutTor.dtd @@ -7,7 +7,7 @@ - + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [torbutton/master] Bug 26961: New user onboarding
commit 3b3161cb9f1e96eaaa303a405df4a88a2be62a55
Author: Kathy Brade
Date: Wed Aug 15 10:06:09 2018 -0400
Bug 26961: New user onboarding
Add strings for use by new user onboarding.
Add "TorOpenSecuritySettings" observer.
---
src/chrome/content/torbutton.js | 10 +-
src/chrome/locale/en/browserOnboarding.properties | 38 +++
trans_tools/import-translations.sh| 1 +
3 files changed, 48 insertions(+), 1 deletion(-)
diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js
index 8e62a5ab..134f10da 100644
--- a/src/chrome/content/torbutton.js
+++ b/src/chrome/content/torbutton.js
@@ -12,7 +12,7 @@ let { showDialog } =
Cu.import("resource://torbutton/modules/utils.js", {});
let { getLocale, unescapeTorString } =
Cu.import("resource://torbutton/modules/utils.js", {});
let SecurityPrefs =
Cu.import("resource://torbutton/modules/security-prefs.js", {});
let NoScriptControl =
Cu.import("resource://torbutton/modules/noscript-control.js", {});
-let { bindPrefAndInit } = Cu.import("resource://torbutton/modules/utils.js",
{});
+let { bindPrefAndInit, observe } =
Cu.import("resource://torbutton/modules/utils.js", {});
Cu.importGlobalProperties(["XMLHttpRequest"]);
@@ -1920,6 +1920,8 @@ function torbutton_is_windowed(wind) {
return true;
}
+let stopOpenSecuritySettingsObserver;
+
// Bug 1506 P3: This is needed pretty much only for the version check
// and the window resizing. See comments for individual functions for
// details
@@ -1953,6 +1955,11 @@ function torbutton_new_window(event)
Ci.nsIWebProgress.NOTIFY_STATE_DOCUMENT);
}
+// Register the TorOpenSecuritySettings observer, which is used by
+// UITour to open the security slider dialog.
+stopOpenSecuritySettingsObserver = observe("TorOpenSecuritySettings",
+ torbutton_open_prefs_dialog);
+
// Check the version on every new window. We're already pinging check in
these cases.
torbutton_do_async_versioncheck();
@@ -1964,6 +1971,7 @@ function torbutton_new_window(event)
function torbutton_close_window(event) {
torbutton_window_pref_observer.unregister();
torbutton_tor_check_observer.unregister();
+stopOpenSecuritySettingsObserver();
window.removeEventListener("sizemodechange", m_tb_resize_handler,
false);
diff --git a/src/chrome/locale/en/browserOnboarding.properties
b/src/chrome/locale/en/browserOnboarding.properties
new file mode 100644
index ..362eefea
--- /dev/null
+++ b/src/chrome/locale/en/browserOnboarding.properties
@@ -0,0 +1,38 @@
+# Copyright (c) 2018, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+onboarding.tour-tor-welcome=Welcome
+onboarding.tour-tor-welcome.title=Youâre ready.
+onboarding.tour-tor-welcome.description=Tor Browser offers the highest
standard of privacy and security while browsing the web. You are now protected
against tracking, surveillance and censorship. Learn how we are doing it by
following this quick onboarding.
+onboarding.tour-tor-welcome.button=Start Now
+
+onboarding.tour-tor-privacy=Privacy
+onboarding.tour-tor-privacy.title=Snub trackers and snoopers.
+onboarding.tour-tor-privacy.description=Tor Browser will isolate all traffic
for each domain you visit. That means trackers and advertisers canât follow
you. And any information storage such as isolated cookies or browser history is
deleted after your session. We make all these modifications to ensure your
privacy and security protections in the browser. Click âTor Networkâ to
learn how we protect you on the network level.
+onboarding.tour-tor-privacy.button=Go to Tor Network
+
+onboarding.tour-tor-network=Tor Network
+onboarding.tour-tor-network.title=Travel a decentralized network.
+onboarding.tour-tor-network.description=Tor Browser will connect you to the
Tor Network. Our network protects you more than a VPN because it is not
centralized. Tor is a network of servers, we call them relays, run by thousands
of volunteers all around the world. This way, thereâs no one point of failure
and no centralized entity you need to trust in order to enjoy the internet. For
each domain you open we create a circuit for you, click on âCircuit
Displayâ to learn how they work.
+onboarding.tour-tor-network.button=Go to Circuit Display
+
+onboarding.tour-tor-circuit-display=Circuit Display
+onboarding.tour-tor-circuit-display.title=See your path.
+onboarding.tour-tor-circuit-display.description=For each domain you visit your
traffic is relayed and encrypted in a circuit across three relays around the
world. This way no website knows where you are connecting from, because they
will only see the connection coming from the last relay. If you would like a
new circuit you can just request one by clicking âNew Circuit for this
Siteâ on
[tor-commits] [tor-browser/tor-browser-60.1.0esr-8.0-1] squash! TB4: Tor Browser's Firefox preference overrides.
commit 36724cc11e94d0dc3094c94f046d76fb5ce44a2b
Author: Arthur Edelstein
Date: Tue Jul 31 07:04:43 2018 -0700
squash! TB4: Tor Browser's Firefox preference overrides.
Bug 14952: Enable http/2 and AltSvc
In Firefox, SPDY/HTTP2 now uses Origin Attributes for
isolation of connections, push streams, origin frames, etc.
That means we get first-party isolation provided
"privacy.firstparty.isolate" is true. So in this patch, we
stop overriding "network.http.spdy.enabled" and
"network.http.spdy.enabled.http2".
Alternate Services also use Origin Attributes for isolation.
So we stop overriding
"network.http.altsvc.enabled" and "network.http.altsvc.oe"
as well.
(All 4 of the abovementioned "network.http.*" prefs adopt
Firefox 60ESR's default value of true.)
However, we want to disable HTTP/2 push for now, so we
set "network.http.spdy.allow-push" to false.
"network.http.spdy.enabled.http2draft" was removed in Bug 1132357.
"network.http.sped.enabled.v2" was removed in Bug 912550.
"network.http.sped.enabled.v3" was removed in Bug 1097944.
"network.http.sped.enabled.v3-1" was removed in Bug 1248197.
---
browser/app/profile/000-tor-browser.js | 9 +
1 file changed, 1 insertion(+), 8 deletions(-)
diff --git a/browser/app/profile/000-tor-browser.js
b/browser/app/profile/000-tor-browser.js
index d0fdbe1040b4..e87b38dcb775 100644
--- a/browser/app/profile/000-tor-browser.js
+++ b/browser/app/profile/000-tor-browser.js
@@ -174,15 +174,8 @@ pref("browser.cache.frecency_experiment", -1);
// Third party stuff
pref("privacy.firstparty.isolate", true); // Always enforce first party
isolation
pref("network.cookie.cookieBehavior", 1);
-pref("network.http.spdy.enabled", false); // Stores state and may have
keepalive issues (both fixable)
-pref("network.http.spdy.enabled.v2", false); // Seems redundant, but just in
case
-pref("network.http.spdy.enabled.v3", false); // Seems redundant, but just in
case
-pref("network.http.spdy.enabled.v3-1", false); // Seems redundant, but just in
case
-pref("network.http.spdy.enabled.http2", false); // Temporarily disabled
pending implementation review
-pref("network.http.spdy.enabled.http2draft", false); // Temporarily disabled
pending implementation review
+pref("network.http.spdy.allow-push", false); // Disabled for now. See
https://bugs.torproject.org/27127
pref("network.predictor.enabled", false); // Temporarily disabled. See
https://bugs.torproject.org/16633
-pref("network.http.altsvc.enabled", false); // Temporarily disabled. See
https://bugs.torproject.org/16673
-pref("network.http.altsvc.oe", false); // Temporarily disabled. See
https://bugs.torproject.org/16673
// Proxy and proxy security
pref("network.proxy.socks", "127.0.0.1");
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [stem/master] Close time window in event handling unit test
commit abc6f298e456f73c8562bf23f2c4ad48dbd0f18b
Author: Damian Johnson
Date: Wed Aug 15 10:55:25 2018 -0700
Close time window in event handling unit test
As Dave discussed on #27053 these new unit tests occasionally fail. Think I
see
what's up: our emit_event() helper blocked until events were consumed but
*not* until they were handled. That is to say in the following psudocode...
event_loop function:
while True:
event = event_queue.pop()
# <=== right here
for listener in listeners:
listener(event)
... our tests could make assertions after dequeueing events but before
calling
the listener, producing the assertion failures he saw.
Joining on the event thread to ensure it's done performing any work it has.
On
the upside this actually simplifies our test code too! :P
Ran the tests several dozen times and this seems to do the trick for me but
unforuntately since this these test failures could be pretty rare tough to
be
sure.
---
test/unit/control/controller.py | 107 +---
1 file changed, 44 insertions(+), 63 deletions(-)
diff --git a/test/unit/control/controller.py b/test/unit/control/controller.py
index 156e62c5..7ee2ab70 100644
--- a/test/unit/control/controller.py
+++ b/test/unit/control/controller.py
@@ -625,30 +625,21 @@ class TestControl(unittest.TestCase):
self.assertRaises(InvalidRequest, self.controller.add_event_listener,
Mock(), EventType.SIGNAL)
@patch('time.time', Mock(return_value = TEST_TIMESTAMP))
- @patch('stem.control.Controller.is_alive')
- def test_events_get_received(self, is_alive_mock):
+ def test_events_get_received(self):
"""
Trigger an event, checking that our listeners get notified.
"""
-is_alive_mock.return_value = True
-self.controller._launch_threads()
+self._emit_event(CIRC_EVENT)
+self.circ_listener.assert_called_once_with(CIRC_EVENT)
+self.bw_listener.assert_not_called()
+self.malformed_listener.assert_not_called()
-try:
- self._emit_event(CIRC_EVENT)
- self.circ_listener.assert_called_once_with(CIRC_EVENT)
- self.bw_listener.assert_not_called()
- self.malformed_listener.assert_not_called()
-
- self._emit_event(BW_EVENT)
- self.bw_listener.assert_called_once_with(BW_EVENT)
-finally:
- is_alive_mock.return_value = False
- self.controller._close()
+self._emit_event(BW_EVENT)
+self.bw_listener.assert_called_once_with(BW_EVENT)
@patch('time.time', Mock(return_value = TEST_TIMESTAMP))
- @patch('stem.control.Controller.is_alive')
- def test_event_listing_with_error(self, is_alive_mock):
+ def test_event_listing_with_error(self):
"""
Raise an exception in an event listener to confirm it doesn't break our
event thread.
@@ -656,32 +647,21 @@ class TestControl(unittest.TestCase):
self.circ_listener.side_effect = ValueError('boom')
-is_alive_mock.return_value = True
-self.controller._launch_threads()
+self._emit_event(CIRC_EVENT)
+self.circ_listener.assert_called_once_with(CIRC_EVENT)
+self.bw_listener.assert_not_called()
+self.malformed_listener.assert_not_called()
-try:
- self._emit_event(CIRC_EVENT)
- self.circ_listener.assert_called_once_with(CIRC_EVENT)
- self.bw_listener.assert_not_called()
- self.malformed_listener.assert_not_called()
-
- self._emit_event(BW_EVENT)
- self.bw_listener.assert_called_once_with(BW_EVENT)
-finally:
- is_alive_mock.return_value = False
- self.controller._close()
+self._emit_event(BW_EVENT)
+self.bw_listener.assert_called_once_with(BW_EVENT)
@patch('time.time', Mock(return_value = TEST_TIMESTAMP))
- @patch('stem.control.Controller.is_alive')
- def test_event_listing_with_malformed_event(self, is_alive_mock):
+ def test_event_listing_with_malformed_event(self):
"""
Attempt to parse a malformed event emitted from Tor. It's important this
doesn't break our event thread.
"""
-is_alive_mock.return_value = True
-self.controller._launch_threads()
-
# When stem.response.convert() encounters malformed content we still recast
# the message.
@@ -689,17 +669,13 @@ class TestControl(unittest.TestCase):
setattr(expected_bad_event, 'arrived_at', TEST_TIMESTAMP)
expected_bad_event.__class__ = stem.response.events.BandwidthEvent
-try:
- self._emit_event(BAD_EVENT)
- self.circ_listener.assert_not_called()
- self.bw_listener.assert_not_called()
- self.malformed_listener.assert_called_once_with(expected_bad_event)
+self._emit_event(BAD_EVENT)
+self.circ_listener.assert_not_called()
+self.bw_listener.assert_not_called()
+self.malformed_listener.assert_called_once_with(expected_bad_event)
- self._emit_event(BW_EVENT)
- self.bw_listener.assert_called_once_with(
[tor-commits] [torbutton/master] Bug 26189: Remove content-policy.js
commit b9b87bcb3105e7aafb42f162b4bb1e8fc7dc54ba
Author: Arthur Edelstein
Date: Mon Aug 13 09:55:40 2018 -0700
Bug 26189: Remove content-policy.js
Our old patch for Bug 8725 was upstreamed in
https://bugzilla.mozilla.org/show_bug.cgi?id=863246
---
src/components/content-policy.js| 174
src/components/startup-observer.js | 7 +-
src/defaults/preferences/preferences.js | 2 +-
3 files changed, 3 insertions(+), 180 deletions(-)
diff --git a/src/components/content-policy.js b/src/components/content-policy.js
deleted file mode 100644
index db72efea..
--- a/src/components/content-policy.js
+++ /dev/null
@@ -1,174 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*-
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/*
- * Based on ResourceFilter: A direct workaround for https://bugzil.la/863246
- *
https://notabug.org/desktopd/no-resource-uri-leak/src/master/src/resource-filter/content-policy.js
- */
-
-const Cc = Components.classes, Ci = Components.interfaces, Cu =
Components.utils;
-
-// Import XPCOMUtils object.
-Cu.import("resource://gre/modules/XPCOMUtils.jsm");
-let { bindPrefAndInit } =
-Cu.import("resource://torbutton/modules/utils.js", {});
-
-function ContentPolicy() {
- this.uriFingerprinting = null;
- let that = this;
-
bindPrefAndInit("extensions.torbutton.resource_and_chrome_uri_fingerprinting",
-function (enabled) {
- that.uriFingerprinting = enabled;
-});
-
- // Register as an nsIContentPolicy filter.
- let registrar = Components.manager.QueryInterface(Ci.nsIComponentRegistrar);
- registrar.registerFactory(this.classID, this.classDescription,
-this.contractID, this);
-
- let catMan = Cc["@mozilla.org/categorymanager;1"]
- .getService(Ci.nsICategoryManager);
- catMan.addCategoryEntry("content-policy", this.contractID, this.contractID,
- false, true);
-}
-
-ContentPolicy.prototype = {
- classDescription: "ContentPolicy",
- classID: Components.ID("{4c03be7d-492f-990e-f0da-f3689e564898}"),
- contractID: "@torproject.org/content-policy;1",
-
- uriWhitelist: {
-// Video playback.
-"chrome://global/content/TopLevelVideoDocument.js":
Ci.nsIContentPolicy.TYPE_SCRIPT,
-"resource://gre/res/TopLevelVideoDocument.css":
Ci.nsIContentPolicy.TYPE_STYLESHEET,
-"chrome://global/content/bindings/videocontrols.xml":
Ci.nsIContentPolicy.TYPE_XBL,
-"chrome://global/content/bindings/scale.xml": Ci.nsIContentPolicy.TYPE_XBL,
-"chrome://global/content/bindings/progressmeter.xml":
Ci.nsIContentPolicy.TYPE_XBL,
-"chrome://global/content/bindings/button.xml":
Ci.nsIContentPolicy.TYPE_XBL,
-"chrome://global/content/bindings/general.xml":
Ci.nsIContentPolicy.TYPE_XBL,
-"chrome://global/content/bindings/text.xml": Ci.nsIContentPolicy.TYPE_XBL,
-
-// Image display.
-"resource://gre/res/ImageDocument.css":
Ci.nsIContentPolicy.TYPE_STYLESHEET,
-"resource://gre/res/TopLevelImageDocument.css":
Ci.nsIContentPolicy.TYPE_STYLESHEET,
-
-// Scrollbars, text box resizer, and content keyboard shortcuts.
-"chrome://global/content/bindings/scrollbar.xml":
Ci.nsIContentPolicy.TYPE_XBL,
-"chrome://global/content/bindings/resizer.xml":
Ci.nsIContentPolicy.TYPE_XBL,
-"chrome://global/content/platformHTMLBindings.xml":
Ci.nsIContentPolicy.TYPE_XBL,
-
-// Directory listing.
-"chrome://global/skin/dirListing/dirListing.css":
Ci.nsIContentPolicy.TYPE_STYLESHEET,
- },
-
- uriRegexWhitelist: [
-// Video playback: whitelist png and svg images under
chrome://global/skin/media
-{ regex: /^chrome:\/\/global\/skin\/media\/.+\.(png|svg)$/,
- type: Ci.nsIContentPolicy.TYPE_IMAGE },
-
-// Video playback and image display: whitelist css files under
chrome://global/skin/media
-{ regex: /^chrome:\/\/global\/skin\/media\/.+\.css$/,
- type: Ci.nsIContentPolicy.TYPE_STYLESHEET },
- ],
-
- // nsISupports
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIContentPolicy, Ci.nsIFactory,
- Ci.nsISupportsWeakReference]),
-
- // nsIFactory
- createInstance: function(outer, iid)
- {
-if (outer)
- throw Cr.NS_ERROR_NO_AGGREGATION;
-return this.QueryInterface(iid);
- },
-
- // nsIContentPolicy
- shouldLoad: function(aContentType, aContentLocation, aRequestOrigin,
aContext, aMimeTypeGuess, aExtra) {
-
-// Accept if the user does not care, no content URI is available or scheme
-// is not resource/chrome.
-if (this.uriFingerprinting || !aContentLocation ||
-!(aContentLocation.schemeIs('resource') ||
- aContentLocation.schemeIs('chrome'))) {
- return Ci.nsIContentPolicy.ACCEPT;
-}
-
-// Accept if no origin URI or if origin
[tor-commits] [tor/release-0.3.4] Merge branch 'maint-0.3.2' into maint-0.3.3
commit 0fc171a47be0cb3b1021816ab80ef823063ce2d1 Merge: 1868982de a26a2735b Author: Nick Mathewson Date: Wed Aug 15 12:20:57 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/bug27081 | 4 configure.ac | 6 -- 2 files changed, 8 insertions(+), 2 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.3] Merge branch 'maint-0.2.9' into maint-0.3.2
commit a26a2735b9cf9c6940d784f755f983088c333833 Merge: 8982719f6 4c355ff18 Author: Nick Mathewson Date: Wed Aug 15 12:20:57 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.2 changes/bug27081 | 4 configure.ac | 6 -- 2 files changed, 8 insertions(+), 2 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3
commit 0fc171a47be0cb3b1021816ab80ef823063ce2d1 Merge: 1868982de a26a2735b Author: Nick Mathewson Date: Wed Aug 15 12:20:57 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/bug27081 | 4 configure.ac | 6 -- 2 files changed, 8 insertions(+), 2 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.4] Merge remote-tracking branch 'github/bug27081_029' into maint-0.2.9
commit 4c355ff18544783a5a283f7660bcdca6cf93062b Merge: fe19b40fe 7a570b818 Author: Nick Mathewson Date: Wed Aug 15 12:20:53 2018 -0400 Merge remote-tracking branch 'github/bug27081_029' into maint-0.2.9 changes/bug27081 | 4 configure.ac | 6 -- 2 files changed, 8 insertions(+), 2 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.3] Merge branch 'maint-0.3.3' into release-0.3.3
commit c80afbacd6b36ef6cd82d9a5a14f7c6358e65acd Merge: ef4d5d99f 0fc171a47 Author: Nick Mathewson Date: Wed Aug 15 12:20:57 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 changes/bug27081 | 4 configure.ac | 6 -- 2 files changed, 8 insertions(+), 2 deletions(-) ___ 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 'maint-0.3.4'
commit 34083f00aba63f00577bf8612e945affc5409270 Merge: 075fcb599 571cb2f66 Author: Nick Mathewson Date: Wed Aug 15 12:20:57 2018 -0400 Merge branch 'maint-0.3.4' changes/bug27081 | 4 configure.ac | 6 -- 2 files changed, 8 insertions(+), 2 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.4] Merge branch 'maint-0.3.3' into maint-0.3.4
commit 571cb2f662f1c39eb1069c12164a3dc202afb362 Merge: 6c1d2549d 0fc171a47 Author: Nick Mathewson Date: Wed Aug 15 12:20:57 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/bug27081 | 4 configure.ac | 6 -- 2 files changed, 8 insertions(+), 2 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.4] Merge branch 'maint-0.3.4' into release-0.3.4
commit 547522f56958d0b77aee48dcf0fbc87b7a26f800 Merge: 0cc4152b0 571cb2f66 Author: Nick Mathewson Date: Wed Aug 15 12:20:57 2018 -0400 Merge branch 'maint-0.3.4' into release-0.3.4 changes/bug27081 | 4 configure.ac | 6 -- 2 files changed, 8 insertions(+), 2 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.3] Merge remote-tracking branch 'github/bug27081_029' into maint-0.2.9
commit 4c355ff18544783a5a283f7660bcdca6cf93062b Merge: fe19b40fe 7a570b818 Author: Nick Mathewson Date: Wed Aug 15 12:20:53 2018 -0400 Merge remote-tracking branch 'github/bug27081_029' into maint-0.2.9 changes/bug27081 | 4 configure.ac | 6 -- 2 files changed, 8 insertions(+), 2 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.4] Merge branch 'maint-0.2.9' into maint-0.3.2
commit a26a2735b9cf9c6940d784f755f983088c333833 Merge: 8982719f6 4c355ff18 Author: Nick Mathewson Date: Wed Aug 15 12:20:57 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.2 changes/bug27081 | 4 configure.ac | 6 -- 2 files changed, 8 insertions(+), 2 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.2.9] Merge branch 'maint-0.2.9' into release-0.2.9
commit fea5c6d791973a524f2bc7fe39b4f62ffd98f413 Merge: fe4c08bb1 4c355ff18 Author: Nick Mathewson Date: Wed Aug 15 12:20:57 2018 -0400 Merge branch 'maint-0.2.9' into release-0.2.9 changes/bug27081 | 4 configure.ac | 6 -- 2 files changed, 8 insertions(+), 2 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.2] Merge branch 'maint-0.2.9' into maint-0.3.2
commit a26a2735b9cf9c6940d784f755f983088c333833 Merge: 8982719f6 4c355ff18 Author: Nick Mathewson Date: Wed Aug 15 12:20:57 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.2 changes/bug27081 | 4 configure.ac | 6 -- 2 files changed, 8 insertions(+), 2 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.2] Don't search for -lpthread on Windows
commit 7a570b818246ca8c8efe4b7de116804f6ebddd91 Author: Nick Mathewson Date: Wed Aug 8 09:56:51 2018 -0400 Don't search for -lpthread on Windows If we're building for Windows, we want to use windows threads no matter what, and we don't want to link a pthread library even if it is present. Fixes bug 27081; bugfix on 1790dc67607799a in 0.1.0.1-rc. --- changes/bug27081 | 4 configure.ac | 6 -- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/changes/bug27081 b/changes/bug27081 new file mode 100644 index 0..74e0efbd2 --- /dev/null +++ b/changes/bug27081 @@ -0,0 +1,4 @@ + o Minor bugfixes (compilation, windows): +- Don't link or search for pthreads when building for Windows, even if we + are using build environment (like mingw) that provides a pthreads + library. Fixes bug 27081; bugfix on 0.1.0.1-rc. diff --git a/configure.ac b/configure.ac index d70032992..76b3f423a 100644 --- a/configure.ac +++ b/configure.ac @@ -370,8 +370,10 @@ if test "$LIBS" != "$saved_LIBS"; then have_rt=yes fi -AC_SEARCH_LIBS(pthread_create, [pthread]) -AC_SEARCH_LIBS(pthread_detach, [pthread]) +if test "$bwin32" = "false"; then + AC_SEARCH_LIBS(pthread_create, [pthread]) + AC_SEARCH_LIBS(pthread_detach, [pthread]) +fi AM_CONDITIONAL(THREADS_WIN32, test "$bwin32" = "true") AM_CONDITIONAL(THREADS_PTHREADS, test "$bwin32" = "false") ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.2] Merge remote-tracking branch 'github/bug27081_029' into maint-0.2.9
commit 4c355ff18544783a5a283f7660bcdca6cf93062b Merge: fe19b40fe 7a570b818 Author: Nick Mathewson Date: Wed Aug 15 12:20:53 2018 -0400 Merge remote-tracking branch 'github/bug27081_029' into maint-0.2.9 changes/bug27081 | 4 configure.ac | 6 -- 2 files changed, 8 insertions(+), 2 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.4] Don't search for -lpthread on Windows
commit 7a570b818246ca8c8efe4b7de116804f6ebddd91 Author: Nick Mathewson Date: Wed Aug 8 09:56:51 2018 -0400 Don't search for -lpthread on Windows If we're building for Windows, we want to use windows threads no matter what, and we don't want to link a pthread library even if it is present. Fixes bug 27081; bugfix on 1790dc67607799a in 0.1.0.1-rc. --- changes/bug27081 | 4 configure.ac | 6 -- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/changes/bug27081 b/changes/bug27081 new file mode 100644 index 0..74e0efbd2 --- /dev/null +++ b/changes/bug27081 @@ -0,0 +1,4 @@ + o Minor bugfixes (compilation, windows): +- Don't link or search for pthreads when building for Windows, even if we + are using build environment (like mingw) that provides a pthreads + library. Fixes bug 27081; bugfix on 0.1.0.1-rc. diff --git a/configure.ac b/configure.ac index d70032992..76b3f423a 100644 --- a/configure.ac +++ b/configure.ac @@ -370,8 +370,10 @@ if test "$LIBS" != "$saved_LIBS"; then have_rt=yes fi -AC_SEARCH_LIBS(pthread_create, [pthread]) -AC_SEARCH_LIBS(pthread_detach, [pthread]) +if test "$bwin32" = "false"; then + AC_SEARCH_LIBS(pthread_create, [pthread]) + AC_SEARCH_LIBS(pthread_detach, [pthread]) +fi AM_CONDITIONAL(THREADS_WIN32, test "$bwin32" = "true") AM_CONDITIONAL(THREADS_PTHREADS, test "$bwin32" = "false") ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.2.9] Merge remote-tracking branch 'github/bug27081_029' into maint-0.2.9
commit 4c355ff18544783a5a283f7660bcdca6cf93062b Merge: fe19b40fe 7a570b818 Author: Nick Mathewson Date: Wed Aug 15 12:20:53 2018 -0400 Merge remote-tracking branch 'github/bug27081_029' into maint-0.2.9 changes/bug27081 | 4 configure.ac | 6 -- 2 files changed, 8 insertions(+), 2 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.2.9] Don't search for -lpthread on Windows
commit 7a570b818246ca8c8efe4b7de116804f6ebddd91 Author: Nick Mathewson Date: Wed Aug 8 09:56:51 2018 -0400 Don't search for -lpthread on Windows If we're building for Windows, we want to use windows threads no matter what, and we don't want to link a pthread library even if it is present. Fixes bug 27081; bugfix on 1790dc67607799a in 0.1.0.1-rc. --- changes/bug27081 | 4 configure.ac | 6 -- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/changes/bug27081 b/changes/bug27081 new file mode 100644 index 0..74e0efbd2 --- /dev/null +++ b/changes/bug27081 @@ -0,0 +1,4 @@ + o Minor bugfixes (compilation, windows): +- Don't link or search for pthreads when building for Windows, even if we + are using build environment (like mingw) that provides a pthreads + library. Fixes bug 27081; bugfix on 0.1.0.1-rc. diff --git a/configure.ac b/configure.ac index d70032992..76b3f423a 100644 --- a/configure.ac +++ b/configure.ac @@ -370,8 +370,10 @@ if test "$LIBS" != "$saved_LIBS"; then have_rt=yes fi -AC_SEARCH_LIBS(pthread_create, [pthread]) -AC_SEARCH_LIBS(pthread_detach, [pthread]) +if test "$bwin32" = "false"; then + AC_SEARCH_LIBS(pthread_create, [pthread]) + AC_SEARCH_LIBS(pthread_detach, [pthread]) +fi AM_CONDITIONAL(THREADS_WIN32, test "$bwin32" = "true") AM_CONDITIONAL(THREADS_PTHREADS, test "$bwin32" = "false") ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.2] Merge branch 'maint-0.3.2' into release-0.3.2
commit 8683c5653244d8ae58b9a569594f14534b31216a Merge: 882f69eb0 a26a2735b Author: Nick Mathewson Date: Wed Aug 15 12:20:57 2018 -0400 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bug27081 | 4 configure.ac | 6 -- 2 files changed, 8 insertions(+), 2 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.3] Don't search for -lpthread on Windows
commit 7a570b818246ca8c8efe4b7de116804f6ebddd91 Author: Nick Mathewson Date: Wed Aug 8 09:56:51 2018 -0400 Don't search for -lpthread on Windows If we're building for Windows, we want to use windows threads no matter what, and we don't want to link a pthread library even if it is present. Fixes bug 27081; bugfix on 1790dc67607799a in 0.1.0.1-rc. --- changes/bug27081 | 4 configure.ac | 6 -- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/changes/bug27081 b/changes/bug27081 new file mode 100644 index 0..74e0efbd2 --- /dev/null +++ b/changes/bug27081 @@ -0,0 +1,4 @@ + o Minor bugfixes (compilation, windows): +- Don't link or search for pthreads when building for Windows, even if we + are using build environment (like mingw) that provides a pthreads + library. Fixes bug 27081; bugfix on 0.1.0.1-rc. diff --git a/configure.ac b/configure.ac index d70032992..76b3f423a 100644 --- a/configure.ac +++ b/configure.ac @@ -370,8 +370,10 @@ if test "$LIBS" != "$saved_LIBS"; then have_rt=yes fi -AC_SEARCH_LIBS(pthread_create, [pthread]) -AC_SEARCH_LIBS(pthread_detach, [pthread]) +if test "$bwin32" = "false"; then + AC_SEARCH_LIBS(pthread_create, [pthread]) + AC_SEARCH_LIBS(pthread_detach, [pthread]) +fi AM_CONDITIONAL(THREADS_WIN32, test "$bwin32" = "true") AM_CONDITIONAL(THREADS_PTHREADS, test "$bwin32" = "false") ___ 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 'maint-0.3.2' into maint-0.3.3
commit 0fc171a47be0cb3b1021816ab80ef823063ce2d1 Merge: 1868982de a26a2735b Author: Nick Mathewson Date: Wed Aug 15 12:20:57 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/bug27081 | 4 configure.ac | 6 -- 2 files changed, 8 insertions(+), 2 deletions(-) ___ 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 'maint-0.2.9' into maint-0.3.2
commit a26a2735b9cf9c6940d784f755f983088c333833 Merge: 8982719f6 4c355ff18 Author: Nick Mathewson Date: Wed Aug 15 12:20:57 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.2 changes/bug27081 | 4 configure.ac | 6 -- 2 files changed, 8 insertions(+), 2 deletions(-) ___ 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 'maint-0.3.3' into maint-0.3.4
commit 571cb2f662f1c39eb1069c12164a3dc202afb362 Merge: 6c1d2549d 0fc171a47 Author: Nick Mathewson Date: Wed Aug 15 12:20:57 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/bug27081 | 4 configure.ac | 6 -- 2 files changed, 8 insertions(+), 2 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge remote-tracking branch 'github/bug27081_029' into maint-0.2.9
commit 4c355ff18544783a5a283f7660bcdca6cf93062b Merge: fe19b40fe 7a570b818 Author: Nick Mathewson Date: Wed Aug 15 12:20:53 2018 -0400 Merge remote-tracking branch 'github/bug27081_029' into maint-0.2.9 changes/bug27081 | 4 configure.ac | 6 -- 2 files changed, 8 insertions(+), 2 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.3.4] Merge branch 'maint-0.3.2' into maint-0.3.3
commit 0fc171a47be0cb3b1021816ab80ef823063ce2d1 Merge: 1868982de a26a2735b Author: Nick Mathewson Date: Wed Aug 15 12:20:57 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/bug27081 | 4 configure.ac | 6 -- 2 files changed, 8 insertions(+), 2 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.3.4] Don't search for -lpthread on Windows
commit 7a570b818246ca8c8efe4b7de116804f6ebddd91 Author: Nick Mathewson Date: Wed Aug 8 09:56:51 2018 -0400 Don't search for -lpthread on Windows If we're building for Windows, we want to use windows threads no matter what, and we don't want to link a pthread library even if it is present. Fixes bug 27081; bugfix on 1790dc67607799a in 0.1.0.1-rc. --- changes/bug27081 | 4 configure.ac | 6 -- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/changes/bug27081 b/changes/bug27081 new file mode 100644 index 0..74e0efbd2 --- /dev/null +++ b/changes/bug27081 @@ -0,0 +1,4 @@ + o Minor bugfixes (compilation, windows): +- Don't link or search for pthreads when building for Windows, even if we + are using build environment (like mingw) that provides a pthreads + library. Fixes bug 27081; bugfix on 0.1.0.1-rc. diff --git a/configure.ac b/configure.ac index d70032992..76b3f423a 100644 --- a/configure.ac +++ b/configure.ac @@ -370,8 +370,10 @@ if test "$LIBS" != "$saved_LIBS"; then have_rt=yes fi -AC_SEARCH_LIBS(pthread_create, [pthread]) -AC_SEARCH_LIBS(pthread_detach, [pthread]) +if test "$bwin32" = "false"; then + AC_SEARCH_LIBS(pthread_create, [pthread]) + AC_SEARCH_LIBS(pthread_detach, [pthread]) +fi AM_CONDITIONAL(THREADS_WIN32, test "$bwin32" = "true") AM_CONDITIONAL(THREADS_PTHREADS, test "$bwin32" = "false") ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.3.4] Merge branch 'maint-0.3.3' into maint-0.3.4
commit 571cb2f662f1c39eb1069c12164a3dc202afb362 Merge: 6c1d2549d 0fc171a47 Author: Nick Mathewson Date: Wed Aug 15 12:20:57 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/bug27081 | 4 configure.ac | 6 -- 2 files changed, 8 insertions(+), 2 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.3.4] Merge branch 'maint-0.2.9' into maint-0.3.2
commit a26a2735b9cf9c6940d784f755f983088c333833 Merge: 8982719f6 4c355ff18 Author: Nick Mathewson Date: Wed Aug 15 12:20:57 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.2 changes/bug27081 | 4 configure.ac | 6 -- 2 files changed, 8 insertions(+), 2 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Don't search for -lpthread on Windows
commit 7a570b818246ca8c8efe4b7de116804f6ebddd91 Author: Nick Mathewson Date: Wed Aug 8 09:56:51 2018 -0400 Don't search for -lpthread on Windows If we're building for Windows, we want to use windows threads no matter what, and we don't want to link a pthread library even if it is present. Fixes bug 27081; bugfix on 1790dc67607799a in 0.1.0.1-rc. --- changes/bug27081 | 4 configure.ac | 6 -- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/changes/bug27081 b/changes/bug27081 new file mode 100644 index 0..74e0efbd2 --- /dev/null +++ b/changes/bug27081 @@ -0,0 +1,4 @@ + o Minor bugfixes (compilation, windows): +- Don't link or search for pthreads when building for Windows, even if we + are using build environment (like mingw) that provides a pthreads + library. Fixes bug 27081; bugfix on 0.1.0.1-rc. diff --git a/configure.ac b/configure.ac index d70032992..76b3f423a 100644 --- a/configure.ac +++ b/configure.ac @@ -370,8 +370,10 @@ if test "$LIBS" != "$saved_LIBS"; then have_rt=yes fi -AC_SEARCH_LIBS(pthread_create, [pthread]) -AC_SEARCH_LIBS(pthread_detach, [pthread]) +if test "$bwin32" = "false"; then + AC_SEARCH_LIBS(pthread_create, [pthread]) + AC_SEARCH_LIBS(pthread_detach, [pthread]) +fi AM_CONDITIONAL(THREADS_WIN32, test "$bwin32" = "true") AM_CONDITIONAL(THREADS_PTHREADS, test "$bwin32" = "false") ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.2.9' into maint-0.3.2
commit a26a2735b9cf9c6940d784f755f983088c333833 Merge: 8982719f6 4c355ff18 Author: Nick Mathewson Date: Wed Aug 15 12:20:57 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.2 changes/bug27081 | 4 configure.ac | 6 -- 2 files changed, 8 insertions(+), 2 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.3.2] Merge branch 'maint-0.2.9' into maint-0.3.2
commit a26a2735b9cf9c6940d784f755f983088c333833 Merge: 8982719f6 4c355ff18 Author: Nick Mathewson Date: Wed Aug 15 12:20:57 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.2 changes/bug27081 | 4 configure.ac | 6 -- 2 files changed, 8 insertions(+), 2 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.3.3] Merge remote-tracking branch 'github/bug27081_029' into maint-0.2.9
commit 4c355ff18544783a5a283f7660bcdca6cf93062b Merge: fe19b40fe 7a570b818 Author: Nick Mathewson Date: Wed Aug 15 12:20:53 2018 -0400 Merge remote-tracking branch 'github/bug27081_029' into maint-0.2.9 changes/bug27081 | 4 configure.ac | 6 -- 2 files changed, 8 insertions(+), 2 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.2.9] Merge remote-tracking branch 'github/bug27081_029' into maint-0.2.9
commit 4c355ff18544783a5a283f7660bcdca6cf93062b Merge: fe19b40fe 7a570b818 Author: Nick Mathewson Date: Wed Aug 15 12:20:53 2018 -0400 Merge remote-tracking branch 'github/bug27081_029' into maint-0.2.9 changes/bug27081 | 4 configure.ac | 6 -- 2 files changed, 8 insertions(+), 2 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.3.3] Don't search for -lpthread on Windows
commit 7a570b818246ca8c8efe4b7de116804f6ebddd91 Author: Nick Mathewson Date: Wed Aug 8 09:56:51 2018 -0400 Don't search for -lpthread on Windows If we're building for Windows, we want to use windows threads no matter what, and we don't want to link a pthread library even if it is present. Fixes bug 27081; bugfix on 1790dc67607799a in 0.1.0.1-rc. --- changes/bug27081 | 4 configure.ac | 6 -- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/changes/bug27081 b/changes/bug27081 new file mode 100644 index 0..74e0efbd2 --- /dev/null +++ b/changes/bug27081 @@ -0,0 +1,4 @@ + o Minor bugfixes (compilation, windows): +- Don't link or search for pthreads when building for Windows, even if we + are using build environment (like mingw) that provides a pthreads + library. Fixes bug 27081; bugfix on 0.1.0.1-rc. diff --git a/configure.ac b/configure.ac index d70032992..76b3f423a 100644 --- a/configure.ac +++ b/configure.ac @@ -370,8 +370,10 @@ if test "$LIBS" != "$saved_LIBS"; then have_rt=yes fi -AC_SEARCH_LIBS(pthread_create, [pthread]) -AC_SEARCH_LIBS(pthread_detach, [pthread]) +if test "$bwin32" = "false"; then + AC_SEARCH_LIBS(pthread_create, [pthread]) + AC_SEARCH_LIBS(pthread_detach, [pthread]) +fi AM_CONDITIONAL(THREADS_WIN32, test "$bwin32" = "true") AM_CONDITIONAL(THREADS_PTHREADS, test "$bwin32" = "false") ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.3.4] Merge remote-tracking branch 'github/bug27081_029' into maint-0.2.9
commit 4c355ff18544783a5a283f7660bcdca6cf93062b Merge: fe19b40fe 7a570b818 Author: Nick Mathewson Date: Wed Aug 15 12:20:53 2018 -0400 Merge remote-tracking branch 'github/bug27081_029' into maint-0.2.9 changes/bug27081 | 4 configure.ac | 6 -- 2 files changed, 8 insertions(+), 2 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3
commit 0fc171a47be0cb3b1021816ab80ef823063ce2d1 Merge: 1868982de a26a2735b Author: Nick Mathewson Date: Wed Aug 15 12:20:57 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/bug27081 | 4 configure.ac | 6 -- 2 files changed, 8 insertions(+), 2 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.3.2] Merge remote-tracking branch 'github/bug27081_029' into maint-0.2.9
commit 4c355ff18544783a5a283f7660bcdca6cf93062b Merge: fe19b40fe 7a570b818 Author: Nick Mathewson Date: Wed Aug 15 12:20:53 2018 -0400 Merge remote-tracking branch 'github/bug27081_029' into maint-0.2.9 changes/bug27081 | 4 configure.ac | 6 -- 2 files changed, 8 insertions(+), 2 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.3.2] Don't search for -lpthread on Windows
commit 7a570b818246ca8c8efe4b7de116804f6ebddd91 Author: Nick Mathewson Date: Wed Aug 8 09:56:51 2018 -0400 Don't search for -lpthread on Windows If we're building for Windows, we want to use windows threads no matter what, and we don't want to link a pthread library even if it is present. Fixes bug 27081; bugfix on 1790dc67607799a in 0.1.0.1-rc. --- changes/bug27081 | 4 configure.ac | 6 -- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/changes/bug27081 b/changes/bug27081 new file mode 100644 index 0..74e0efbd2 --- /dev/null +++ b/changes/bug27081 @@ -0,0 +1,4 @@ + o Minor bugfixes (compilation, windows): +- Don't link or search for pthreads when building for Windows, even if we + are using build environment (like mingw) that provides a pthreads + library. Fixes bug 27081; bugfix on 0.1.0.1-rc. diff --git a/configure.ac b/configure.ac index d70032992..76b3f423a 100644 --- a/configure.ac +++ b/configure.ac @@ -370,8 +370,10 @@ if test "$LIBS" != "$saved_LIBS"; then have_rt=yes fi -AC_SEARCH_LIBS(pthread_create, [pthread]) -AC_SEARCH_LIBS(pthread_detach, [pthread]) +if test "$bwin32" = "false"; then + AC_SEARCH_LIBS(pthread_create, [pthread]) + AC_SEARCH_LIBS(pthread_detach, [pthread]) +fi AM_CONDITIONAL(THREADS_WIN32, test "$bwin32" = "true") AM_CONDITIONAL(THREADS_PTHREADS, test "$bwin32" = "false") ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.2.9] Don't search for -lpthread on Windows
commit 7a570b818246ca8c8efe4b7de116804f6ebddd91 Author: Nick Mathewson Date: Wed Aug 8 09:56:51 2018 -0400 Don't search for -lpthread on Windows If we're building for Windows, we want to use windows threads no matter what, and we don't want to link a pthread library even if it is present. Fixes bug 27081; bugfix on 1790dc67607799a in 0.1.0.1-rc. --- changes/bug27081 | 4 configure.ac | 6 -- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/changes/bug27081 b/changes/bug27081 new file mode 100644 index 0..74e0efbd2 --- /dev/null +++ b/changes/bug27081 @@ -0,0 +1,4 @@ + o Minor bugfixes (compilation, windows): +- Don't link or search for pthreads when building for Windows, even if we + are using build environment (like mingw) that provides a pthreads + library. Fixes bug 27081; bugfix on 0.1.0.1-rc. diff --git a/configure.ac b/configure.ac index d70032992..76b3f423a 100644 --- a/configure.ac +++ b/configure.ac @@ -370,8 +370,10 @@ if test "$LIBS" != "$saved_LIBS"; then have_rt=yes fi -AC_SEARCH_LIBS(pthread_create, [pthread]) -AC_SEARCH_LIBS(pthread_detach, [pthread]) +if test "$bwin32" = "false"; then + AC_SEARCH_LIBS(pthread_create, [pthread]) + AC_SEARCH_LIBS(pthread_detach, [pthread]) +fi AM_CONDITIONAL(THREADS_WIN32, test "$bwin32" = "true") AM_CONDITIONAL(THREADS_PTHREADS, test "$bwin32" = "false") ___ 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-60.1.0esr-8.0-1] Bug 26826 - Disable tab queue and delete SYSTEM_ALERT_WINDOW permission
commit de2e1fbe5b024957ed469063bf38b8b274b4f4ba Author: Matthew Finkel Date: Fri Aug 3 21:29:47 2018 + Bug 26826 - Disable tab queue and delete SYSTEM_ALERT_WINDOW permission --- mobile/android/app/src/main/res/xml/preferences_general.xml| 1 + mobile/android/app/src/main/res/xml/preferences_general_tablet.xml | 1 + mobile/android/base/FennecManifest_permissions.xml.in | 3 --- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/mobile/android/app/src/main/res/xml/preferences_general.xml b/mobile/android/app/src/main/res/xml/preferences_general.xml index f148ae61b169..ef739db0c3d8 100644 --- a/mobile/android/app/src/main/res/xml/preferences_general.xml +++ b/mobile/android/app/src/main/res/xml/preferences_general.xml @@ -31,6 +31,7 @@ diff --git a/mobile/android/base/FennecManifest_permissions.xml.in b/mobile/android/base/FennecManifest_permissions.xml.in index 1b7b2d5475ec..f7bfe475bece 100644 --- a/mobile/android/base/FennecManifest_permissions.xml.in +++ b/mobile/android/base/FennecManifest_permissions.xml.in @@ -46,9 +46,6 @@ #endif - - - #ifdef MOZ_ANDROID_BEAM ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/abouttor-homepage] Update translations for abouttor-homepage
commit aeff35e27a5bedad568c6758b8176441a5de20a1 Author: Translation commit bot Date: Wed Aug 15 13:15:04 2018 + Update translations for abouttor-homepage --- de/aboutTor.dtd | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/de/aboutTor.dtd b/de/aboutTor.dtd index 1bcbccb5d..a653661a9 100644 --- a/de/aboutTor.dtd +++ b/de/aboutTor.dtd @@ -6,20 +6,20 @@ - - + + - + https://duckduckgo.com";> - + - + - + https://www.torproject.org/getinvolved/volunteer.html.en";> ___ 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 12968: enable HEASLR in Windows x86_64 builds
commit f7247cca852ce5f9cce092ca82cb92efbbba611d
Author: Nicolas Vigier
Date: Tue May 29 13:42:09 2018 +0200
Bug 12968: enable HEASLR in Windows x86_64 builds
We still need the other half of the fix for actually providing higher
entropy (see bug 12968, comment:17ff. for discussion).
---
rbm.conf | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/rbm.conf b/rbm.conf
index ff36e6c..cd6dc08 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -204,6 +204,8 @@ targets:
container:
arch: amd64
faketime_path: /usr/lib/x86_64-linux-gnu/faketime/libfaketime.so.1
+ # HEASLR is 64 bit only (see bug 12968)
+ flag_HEASLR: '-Wl,--high-entropy-va'
windows-i686:
arch: i686
var:
@@ -226,7 +228,7 @@ targets:
suite: jessie
configure_opt: '--host=[% c("arch") %]-w64-mingw32 CFLAGS="[%
c("var/CFLAGS") %]" LDFLAGS="[% c("var/LDFLAGS") %]"'
CFLAGS: '-fstack-protector-strong -fno-strict-overflow
-Wno-missing-field-initializers -Wformat -Wformat-security [%
c("var/flag_mwindows") %]'
- LDFLAGS: '-Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section
-Wl,--no-insert-timestamp -lssp -L$gcclibs [% c("var/flag_mwindows") %]'
+ LDFLAGS: '-Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section
-Wl,--no-insert-timestamp -lssp -L$gcclibs [% c("var/flag_HEASLR") %] [%
c("var/flag_mwindows") %]'
flag_mwindows: '-mwindows'
compiler: mingw-w64
deps:
___
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-60.1.0esr-8.0-1] Bug 25906 - Imply false both Adjust and Leanplum configure options
commit ccb635fc7b7c02c4431adfbe67bff2f73e491157
Author: Matthew Finkel
Date: Fri Aug 3 18:32:46 2018 +
Bug 25906 - Imply false both Adjust and Leanplum configure options
These configure options should be false already, because we set
|--without-google-play-services| in .mozconfig-android. But, this
is another layer of certainty.
---
mobile/android/torbrowser.configure | 5 +
1 file changed, 5 insertions(+)
diff --git a/mobile/android/torbrowser.configure
b/mobile/android/torbrowser.configure
index ac30fde888a6..8f3462982dc7 100644
--- a/mobile/android/torbrowser.configure
+++ b/mobile/android/torbrowser.configure
@@ -44,3 +44,8 @@ imply_option('MOZ_SERVICES_HEALTHREPORT', False)
imply_option('MOZ_ANDROID_NETWORK_STATE', False);
imply_option('MOZ_ANDROID_LOCATION', False);
+
+# Exclude Leanplum MMA (marketing automation and user behavior)
+imply_option('MOZ_ANDROID_MMA', False);
+# Exclude Adjust (installation tracking)
+imply_option('MOZ_INSTALL_TRACKING', False);
___
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-60.1.0esr-8.0-1] Bug 27016 - Create proxy connection during image download
commit dda3c7d44a12cc2d9ff5e071605c8f36670ac956
Author: Matthew Finkel
Date: Thu Aug 2 21:49:05 2018 +
Bug 27016 - Create proxy connection during image download
Picasso, the image retrieval library used by Fennec, ignores the network
proxy configuration. We override the openConnection() method and create
the connection using the configured proxy.
---
.../java/org/mozilla/gecko/home/ImageLoader.java | 22 ++
1 file changed, 22 insertions(+)
diff --git a/mobile/android/base/java/org/mozilla/gecko/home/ImageLoader.java
b/mobile/android/base/java/org/mozilla/gecko/home/ImageLoader.java
index 2bbd82a8df77..cbbe7babbba4 100644
--- a/mobile/android/base/java/org/mozilla/gecko/home/ImageLoader.java
+++ b/mobile/android/base/java/org/mozilla/gecko/home/ImageLoader.java
@@ -15,9 +15,14 @@ import com.squareup.picasso.Picasso;
import com.squareup.picasso.Downloader.Response;
import com.squareup.picasso.UrlConnectionDownloader;
+import org.mozilla.gecko.util.ProxySelector;
+
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
+import java.net.HttpURLConnection;
+import java.net.URI;
+import java.net.URISyntaxException;
import java.util.EnumSet;
import java.util.Set;
@@ -84,6 +89,23 @@ public class ImageLoader {
this.distribution = distribution;
}
+@Override
+protected HttpURLConnection openConnection(Uri path) throws
IOException {
+try {
+// This is annoying, but |path| is an android.net.Uri and
+// openConnectionWithProxy() accepts a java.net.URI
+return
(HttpURLConnection)ProxySelector.openConnectionWithProxy(
+new URI(
+path.getScheme(), path.getHost(), path.getPath(),
+path.getEncodedFragment()));
+} catch (URISyntaxException ex) {
+// And android.net.Uri is more lenient than java.net.URI.
+// Uri does not catch syntax errors which URI may catch.
+// We'll re-throw this as an IOException
+throw new IOException(ex.getMessage());
+}
+}
+
private Density getDensity(float factor) {
final DisplayMetrics dm =
context.getResources().getDisplayMetrics();
final float densityDpi = dm.densityDpi * factor;
___
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 27129: Add locales ca, ga, id, is, nb
commit ad4233157674808d5d8557ada5ce97a145d8a3e5
Author: Arthur Edelstein
Date: Mon Aug 13 15:13:25 2018 -0700
Bug 27129: Add locales ca, ga, id, is, nb
---
rbm.conf | 5 +
1 file changed, 5 insertions(+)
diff --git a/rbm.conf b/rbm.conf
index 8cfa5e2..ff36e6c 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -52,15 +52,20 @@ var:
locale_ja: ja
locales:
- ar
+- ca
- da
- de
- es-ES
- fa
- fr
+- ga-IE
- he
+- id
+- is
- it
- '[% c("var/locale_ja") %]'
- ko
+- nb-NO
- nl
- pl
- pt-BR
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-launcher/master] Bug 27129: Add locales ca, ga, id, is, nb
commit 0fb1ea7e8ec9b118c1aa08f92fef7cb7b47cb4ea Author: Arthur Edelstein Date: Mon Aug 13 14:54:36 2018 -0700 Bug 27129: Add locales ca, ga, id, is, nb --- src/chrome/content/network-settings.js | 5 + 1 file changed, 5 insertions(+) diff --git a/src/chrome/content/network-settings.js b/src/chrome/content/network-settings.js index 0e18b29..aaa91ac 100644 --- a/src/chrome/content/network-settings.js +++ b/src/chrome/content/network-settings.js @@ -305,16 +305,21 @@ function populateLocaleList(aLangPackAddons) "en-US" : "English", "ar": "\u0627\u0644\u0639\u0631\u0628\u064a\u0629", "bn-BD" : "\u09ac\u09be\u0982\u09b2\u09be", +"ca": "català ", "da": "Dansk", "de": "Deutsch", "es-ES" : "Espa\u00f1ol", "fa": "\u0641\u0627\u0631\u0633\u06cc", "fr": "Fran\u00e7ais", +"ga": "Gaeilge (Irish)", "he": "\u05e2\u05d1\u05e8\u05d9\u05ea", +"id": "bahasa Indonesia", +"is": "\u0355slenska", "it": "Italiano", "ja": "\u65e5\u672c\u8a9e", "ko": "\ud55c\uad6d\uc5b4", "nl": "Nederlands", +"nb": "Norsk bokmå\u0345l", "pl": "Polski", "pt-PT" : "Portugu\u00eas (Europeu)", "ru": "\u0420\u0443\u0441\u0441\u043a\u0438\u0439", ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [torbutton/master] Bug 27129: Add locales ca, ga, id, is, nb
commit 859160f4d23a2706c4cad689c5379a33b0070ef5 Author: Arthur Edelstein Date: Mon Aug 13 14:35:33 2018 -0700 Bug 27129: Add locales ca, ga, id, is, nb --- trans_tools/import-translations.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/trans_tools/import-translations.sh b/trans_tools/import-translations.sh index 736d62ff..2f0be994 100755 --- a/trans_tools/import-translations.sh +++ b/trans_tools/import-translations.sh @@ -2,7 +2,7 @@ # This var comes from the TBB locale list. # XXX: Find some way to keep this, tor-launcher, and Tor Browser in sync -BUNDLE_LOCALES="ar bn-BD da de es fa fr he it ja ko nl pl pt-BR ru sv tr vi zh-CN zh-TW" +BUNDLE_LOCALES="ar bn-BD ca da de es fa fr ga he id is it ja ko nb nl pl pt-BR ru sv tr vi zh-CN zh-TW" # XXX: Basque (eu) by request in #10687. # This is not used for official builds, but should remain ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [policies/master] Add company policy douments and job descriptions.
commit 094f4e844bcfc9e01fb05ef230de9c8cdb926abe Author: Linus Nordberg Date: Wed Aug 15 13:28:46 2018 +0200 Add company policy douments and job descriptions. Also, add a top level README file. --- README.md | 6 ++ jobdescs/index.html| 23 + jobdescs/jobdesc_ED.txt| 93 + jobdescs/jobdesc_P.txt | 65 ++ jobdescs/jobdesc_VP.txt| 51 +++ policies/TPI_Employee_Communications_Policy.pdf| Bin 0 -> 78339 bytes policies/TPI_Harassment_Prevention_Policy.pdf | Bin 0 -> 98932 bytes policies/TPI_Internal_Complaint_Review_Process.pdf | Bin 0 -> 78416 bytes policies/TPI_Relationships_Policy.pdf | Bin 0 -> 70495 bytes policies/index.html| 34 10 files changed, 272 insertions(+) diff --git a/README.md b/README.md new file mode 100644 index 000..bff607d --- /dev/null +++ b/README.md @@ -0,0 +1,6 @@ +This repository contains the following types of +Tor Project Inc. documents: + +* [Founding documents](corpdocs) +* [Policy documents](policies) +* [Job descriptions](jobdescs) diff --git a/jobdescs/index.html b/jobdescs/index.html new file mode 100644 index 000..a68c5f8 --- /dev/null +++ b/jobdescs/index.html @@ -0,0 +1,23 @@ +Tor Project, Inc. Policy Documents + + + + Internet Freedom Nonprofit Seeks Executive Director + + + + + + Job Description, President + + + + + + Job Description, Vice President + + + + + + diff --git a/jobdescs/jobdesc_ED.txt b/jobdescs/jobdesc_ED.txt new file mode 100644 index 000..d6ca80f --- /dev/null +++ b/jobdescs/jobdesc_ED.txt @@ -0,0 +1,93 @@ +Internet Freedom Nonprofit Seeks Executive Director + +The Tor Project, Inc., is a 501(c)(3) organization headquartered in +Seattle that provides the technical infrastructure for privacy +protection over the Internet, helping millions of activists, +journalists and others around the world communicate securely. With +paid staff and contractors of around 35 engineers and operational +support people, plus many volunteers all over the world who contribute +to our work, the Tor Project is funded in part by government grants +and contracts, as well as by individual, foundation, and corporate +donations. Our mission is "To advance human rights and freedoms by +creating and deploying free and open anonymity and privacy +technologies, supporting their unrestricted availability and use, and +furthering their scientific and popular understanding." + +We are currently seeking an Executive Director to lead the +organization into our next phase of growth and sustainability. This +position can be based anywhere, as our work is international in +scope. This person must be able to communicate regularly with the +staff working on the ground at our organizational headquarters in +Seattle. This position reports directly to the Tor Project Board of +Directors. + +The Executive Director sets the tone for the organization, thinks +strategically, and provides leadership and guidance in the day-to-day +operations. The Tor Project does open source software development, and +the Executive Director must be able to engage with various different +stakeholders in managing the organization. Some of the key attributes +of this person should be: + +* A strong public commitment to privacy, and a good understanding of + related debates. + +* A good understanding of open source development culture, and a + commitment to transparent organizations. + +* A strong commitment to creating and maintaining a healthy and safe + working environment, including for remote participants. + +* A talent for consensus and community building. + +* An ability to effectively support and collaborate with diverse + groups of people. + +* A willingness to share responsibility and leadership of the + organization with a leadership team. + +* An enthusiasm for coaching and developing emerging leaders. + +* A natural leadership ability that encourages and empowers others to + do their best work. + +* Strong written and verbal communications skills. + +Some of the key requirements of this position are at least five years +or equivalent experience in each of the following areas: + +* Nonprofit fundraising, including raising money from government + contracts and grants, foundations, corporations and individual + contributions; + +* Talking to and working with the press, including being active and + visible in promoting organizational goals and enhancing the + organization's image; + +* Solid, hands-on, budget management skills, including budget + preparation, analysis, decision-making and reporting; + +* Human resource administration, including working with a leadership + team and hiring and firing experience; + +* Working
[tor-commits] [translation/abouttor-homepage] Update translations for abouttor-homepage
commit d615bcbba7b2df1b3bb17bb9d278861ed70ed9fd Author: Translation commit bot Date: Wed Aug 15 11:15:04 2018 + Update translations for abouttor-homepage --- da/aboutTor.dtd | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/da/aboutTor.dtd b/da/aboutTor.dtd index 74748b623..9bd057c86 100644 --- a/da/aboutTor.dtd +++ b/da/aboutTor.dtd @@ -6,20 +6,20 @@ - - + + - + https://duckduckgo.com";> - + - + - + https://www.torproject.org/getinvolved/volunteer.html.en";> ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [metrics-web/master] Remove hidserv-frac-reporting graph and CSV file.
commit ec86ad02973963e9efad46b0ac21ae4f04c87fc6
Author: Karsten Loesing
Date: Thu Aug 9 16:13:45 2018 +0200
Remove hidserv-frac-reporting graph and CSV file.
This was the graph showing the "Fraction of relays reporting
onion-service statistics". Fraction values will still be available as
part of the other onion-service statistics' per-graph CSV files.
Implements #26950.
---
src/main/R/rserver/graphs.R| 34 --
src/main/resources/web.xml | 4 ---
src/main/resources/web/json/categories.json| 3 +-
src/main/resources/web/json/metrics.json | 11 ---
.../resources/web/jsps/reproducible-metrics.jsp| 1 -
src/main/resources/web/jsps/stats.jsp | 25
6 files changed, 1 insertion(+), 77 deletions(-)
diff --git a/src/main/R/rserver/graphs.R b/src/main/R/rserver/graphs.R
index ab37a32..66a1414 100644
--- a/src/main/R/rserver/graphs.R
+++ b/src/main/R/rserver/graphs.R
@@ -1287,40 +1287,6 @@ write_hidserv_rend_relayed_cells <- function(start_p =
NULL, end_p = NULL,
write.csv(path_p, quote = FALSE, row.names = FALSE, na = "")
}
-prepare_hidserv_frac_reporting <- function(start_p, end_p) {
- read.csv(paste(stats_dir, "hidserv.csv", sep = ""),
-colClasses = c("date" = "Date")) %>%
-filter(if (!is.null(start_p)) date >= as.Date(start_p) else TRUE) %>%
-filter(if (!is.null(end_p)) date <= as.Date(end_p) else TRUE) %>%
-select(date, frac, type)
-}
-
-plot_hidserv_frac_reporting <- function(start_p, end_p, path_p) {
- prepare_hidserv_frac_reporting(start_p, end_p) %>%
-ggplot(aes(x = date, y = frac, colour = type)) +
-geom_line() +
-geom_hline(yintercept = 0.01, linetype = 2) +
-scale_x_date(name = "", breaks = custom_breaks,
- labels = custom_labels, minor_breaks = custom_minor_breaks) +
-scale_y_continuous(name = "", labels = percent, limits = c(0, NA)) +
-scale_colour_hue(name = "",
- breaks = c("rend-relayed-cells", "dir-onions-seen"),
- labels = c("Onion-service traffic",
-"Unique .onion addresses")) +
-ggtitle(paste("Fraction of relays reporting onion-service",
- "statistics")) +
-labs(caption = copyright_notice) +
-theme(legend.position = "top")
- ggsave(filename = path_p, width = 8, height = 5, dpi = 150)
-}
-
-write_hidserv_frac_reporting <- function(start_p = NULL, end_p = NULL, path_p)
{
- prepare_hidserv_frac_reporting(start_p, end_p) %>%
-mutate(type = ifelse(type == "dir-onions-seen", "onions", "relayed")) %>%
-spread(type, frac) %>%
-write.csv(path_p, quote = FALSE, row.names = FALSE, na = "")
-}
-
prepare_webstats_tb <- function(start_p, end_p) {
load(paste(rdata_dir, "webstats-tb.RData", sep = ""))
data %>%
diff --git a/src/main/resources/web.xml b/src/main/resources/web.xml
index ae252da..5c88564 100644
--- a/src/main/resources/web.xml
+++ b/src/main/resources/web.xml
@@ -48,7 +48,6 @@
/connbidirect.html
/hidserv-dir-onions-seen.html
/hidserv-rend-relayed-cells.html
-/hidserv-frac-reporting.html
/webstats-tb.html
/webstats-tb-platform.html
/webstats-tb-locale.html
@@ -190,9 +189,6 @@
/hidserv-rend-relayed-cells.png
/hidserv-rend-relayed-cells.pdf
/hidserv-rend-relayed-cells.csv
-/hidserv-frac-reporting.png
-/hidserv-frac-reporting.pdf
-/hidserv-frac-reporting.csv
/webstats-tb.png
/webstats-tb.pdf
/webstats-tb.csv
diff --git a/src/main/resources/web/json/categories.json
b/src/main/resources/web/json/categories.json
index 23e6ee4..a5a4fcf 100644
--- a/src/main/resources/web/json/categories.json
+++ b/src/main/resources/web/json/categories.json
@@ -74,8 +74,7 @@
"description": "Onion services are services that are only accessible via
the Tor network.",
"metrics": [
"hidserv-dir-onions-seen",
- "hidserv-rend-relayed-cells",
- "hidserv-frac-reporting"
+ "hidserv-rend-relayed-cells"
]
},
{
diff --git a/src/main/resources/web/json/metrics.json
b/src/main/resources/web/json/metrics.json
index 0f85a28..ab5d98d 100644
--- a/src/main/resources/web/json/metrics.json
+++ b/src/main/resources/web/json/metrics.json
@@ -367,17 +367,6 @@
]
},
{
-"id": "hidserv-frac-reporting",
-"title": "Fraction of relays reporting onion-service statistics",
-"type": "Graph",
-"description": "This graph shows the fraction of relays that report statistics on onion service usage. If at least 1%
of relays report a statistic, it gets extrapolated towards a network total,
where higher fractions are produce more accurate results. For more details on
the extrapolation algorithm, see https://blog.torproject.org/blog/some-statistics-about-onions\";>this
blog post and https://research.torproject.org/techreports/extrapolating-hidserv-stats-2015-01-31.pdf\";>thi
[tor-commits] [metrics-web/master] Make suggested changes to per-graph CSV files.
commit 0e6936003d0b9b4cc8d9388ea8a56eadcfdce1f9
Author: Karsten Loesing
Date: Thu Aug 9 16:08:17 2018 +0200
Make suggested changes to per-graph CSV files.
Implements #26998.
---
src/main/R/clients/split-clients.R| 6 +-
src/main/R/rserver/graphs.R | 70 ++--
src/main/resources/web/jsps/stats.jsp | 153 --
3 files changed, 64 insertions(+), 165 deletions(-)
diff --git a/src/main/R/clients/split-clients.R
b/src/main/R/clients/split-clients.R
index 50b03d4..9f80902 100644
--- a/src/main/R/clients/split-clients.R
+++ b/src/main/R/clients/split-clients.R
@@ -1,12 +1,12 @@
dir.create("RData", showWarnings = FALSE)
c <- read.csv("clients.csv", stringsAsFactors = FALSE)
-data <- c[c$node == 'relay', !(names(c) %in% c("node", "frac"))]
+data <- c[c$node == 'relay', !(names(c) %in% c("node"))]
save(data, file = "RData/clients-relay.RData")
-data <- c[c$node == 'bridge', !(names(c) %in% c("node", "frac"))]
+data <- c[c$node == 'bridge', !(names(c) %in% c("node"))]
save(data, file = "RData/clients-bridge.RData")
u <- read.csv("userstats-combined.csv", stringsAsFactors = FALSE)
-data <- u[, !(names(u) %in% c("node", "version", "frac"))]
+data <- u[, !(names(u) %in% c("node", "version"))]
save(data, file = "RData/userstats-bridge-combined.RData")
diff --git a/src/main/R/rserver/graphs.R b/src/main/R/rserver/graphs.R
index 12a80e9..ab37a32 100644
--- a/src/main/R/rserver/graphs.R
+++ b/src/main/R/rserver/graphs.R
@@ -423,7 +423,6 @@ plot_versions <- function(start_p, end_p, path_p) {
write_versions <- function(start_p = NULL, end_p = NULL, path_p) {
prepare_versions(start_p, end_p) %>%
-spread(key = "version", value = "relays", fill = 0) %>%
write.csv(path_p, quote = FALSE, row.names = FALSE, na = "")
}
@@ -459,6 +458,7 @@ plot_platforms <- function(start_p, end_p, path_p) {
write_platforms <- function(start_p = NULL, end_p = NULL, path_p) {
prepare_platforms(start_p, end_p) %>%
+mutate(platform = tolower(platform)) %>%
spread(platform, relays) %>%
write.csv(path_p, quote = FALSE, row.names = FALSE, na = "")
}
@@ -607,8 +607,6 @@ plot_relayflags <- function(start_p, end_p, flag_p, path_p)
{
write_relayflags <- function(start_p = NULL, end_p = NULL, flag_p = NULL,
path_p) {
prepare_relayflags(start_p, end_p, flag_p) %>%
-mutate(flag = tolower(flag)) %>%
-spread(flag, relays) %>%
write.csv(path_p, quote = FALSE, row.names = FALSE, na = "")
}
@@ -832,9 +830,6 @@ plot_connbidirect <- function(start_p, end_p, path_p) {
write_connbidirect <- function(start_p = NULL, end_p = NULL, path_p) {
prepare_connbidirect(start_p, end_p) %>%
rename(q1 = X0.25, md = X0.5, q3 = X0.75) %>%
-gather(variable, value, -(date:direction)) %>%
-unite(temp, direction, variable) %>%
-spread(temp, value) %>%
write.csv(path_p, quote = FALSE, row.names = FALSE, na = "")
}
@@ -900,7 +895,8 @@ plot_userstats <- function(start_p, end_p, node_p,
variable_p, value_p,
events_p, path_p) {
load(paste(rdata_dir, "clients-", node_p, ".RData", sep = ""))
c <- data
- u <- c[c$date >= start_p & c$date <= end_p, ]
+ u <- c[c$date >= start_p & c$date <= end_p, c("date", "country", "transport",
+ "version", "lower", "upper", "clients")]
u <- rbind(u, data.frame(date = start_p,
country = ifelse(variable_p == "country" & value_p != "all", value_p,
""),
transport = ifelse(variable_p == "transport", value_p, ""),
@@ -1053,8 +1049,7 @@ write_userstats_relay_country <- function(start_p = NULL,
end_p = NULL,
country == ifelse(country_p == "all", "", country_p) else TRUE) %>%
filter(transport == "") %>%
filter(version == "") %>%
-mutate(downturns = clients < lower, upturns = clients > upper) %>%
-select(date, country, clients, downturns, upturns, lower, upper) %>%
+select(date, country, clients, lower, upper, frac) %>%
rename(users = clients) %>%
write.csv(path_p, quote = FALSE, row.names = FALSE, na = "")
}
@@ -1069,7 +1064,7 @@ write_userstats_bridge_country <- function(start_p =
NULL, end_p = NULL,
country == ifelse(country_p == "all", "", country_p) else TRUE) %>%
filter(transport == "") %>%
filter(version == "") %>%
-select(date, country, clients) %>%
+select(date, country, clients, frac) %>%
rename(users = clients) %>%
write.csv(path_p, quote = FALSE, row.names = FALSE, na = "")
}
@@ -1083,24 +1078,21 @@ write_userstats_bridge_transport <- function(start_p =
NULL, end_p = NULL,
filter(country == "") %>%
filter(version == "") %>%
filter(transport != "") %>%
-select(date, transport, clients)
+select(date, transport, clients, frac)
if (is.null(transport_p) || "!" %in% transport_p) {
n <- u %>%
filter(transport != "") %>%
- group_by(date) %>%
+ group_by(date, frac) %>%
summarize(clients = sum(clients))
u <- rbind(u, da
