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

[tor-browser/tor-browser-91.6.0esr-11.5-1] Revert "Bug 1724777, optimize suppressed MicroTask handling, r=mccr8 a=RyanVM"
by richard＠torproject.org 09 Feb '22

09 Feb '22

commit 9901ee290ce9171d5487690c1dfa26935027dcc3 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Dec 7 16:19:15 2021 +0000 Revert "Bug 1724777, optimize suppressed MicroTask handling, r=mccr8 a=RyanVM" This reverts commit 1eb1364357ac5bc2a4531337fb5416af39c3793f. This fixes tor-browser#40721, tor-browser#40698, and tor-browser#40706. However, it is a temporary workaround, that we should revert once https://bugzilla.mozilla.org/show_bug.cgi?id=1744719 is fixed. --- dom/base/Document.cpp | 12 ------ dom/base/Document.h | 8 +++- dom/base/test/mochitest.ini | 2 - dom/base/test/test_suppressed_microtasks.html | 62 --------------------------- dom/workers/RuntimeService.cpp | 4 +- dom/workers/WorkerPrivate.cpp | 2 +- dom/worklet/WorkletThread.cpp | 2 +- xpcom/base/CycleCollectedJSContext.cpp | 51 ++++++---------------- xpcom/base/CycleCollectedJSContext.h | 29 +++---------- 9 files changed, 28 insertions(+), 144 deletions(-) diff --git a/dom/base/Document.cpp b/dom/base/Document.cpp index a58e76cb5258..0ef4b3236477 100644 --- a/dom/base/Document.cpp +++ b/dom/base/Document.cpp @@ -15633,18 +15633,6 @@ nsAutoSyncOperation::~nsAutoSyncOperation() { } } -void Document::SetIsInSyncOperation(bool aSync) { - if (CycleCollectedJSContext* ccjs = CycleCollectedJSContext::Get()) { - ccjs->UpdateMicroTaskSuppressionGeneration(); - } - - if (aSync) { - ++mInSyncOperationCount; - } else { - --mInSyncOperationCount; - } -} - gfxUserFontSet* Document::GetUserFontSet() { if (!mFontFaceSet) { return nullptr; diff --git a/dom/base/Document.h b/dom/base/Document.h index 7165496397f3..69e59d09b924 100644 --- a/dom/base/Document.h +++ b/dom/base/Document.h @@ -3214,7 +3214,13 @@ class Document : public nsINode, bool IsInSyncOperation() { return mInSyncOperationCount != 0; } - void SetIsInSyncOperation(bool aSync); + void SetIsInSyncOperation(bool aSync) { + if (aSync) { + ++mInSyncOperationCount; + } else { + --mInSyncOperationCount; + } + } bool CreatingStaticClone() const { return mCreatingStaticClone; } diff --git a/dom/base/test/mochitest.ini b/dom/base/test/mochitest.ini index 06b5691422c5..e287a0d10ae8 100644 --- a/dom/base/test/mochitest.ini +++ b/dom/base/test/mochitest.ini @@ -769,8 +769,6 @@ skip-if = debug == false [test_shared_compartment2.html] [test_structuredclone_backref.html] [test_style_cssText.html] -[test_suppressed_microtasks.html] -skip-if = debug || asan || verify || toolkit == 'android' # The test needs to run reasonably fast. [test_text_wholeText.html] [test_textnode_normalize_in_selection.html] [test_textnode_split_in_selection.html] diff --git a/dom/base/test/test_suppressed_microtasks.html b/dom/base/test/test_suppressed_microtasks.html deleted file mode 100644 index f5d333638698..000000000000 --- a/dom/base/test/test_suppressed_microtasks.html +++ /dev/null @@ -1,62 +0,0 @@ -<!DOCTYPE HTML> -<html> -<head> - <meta charset="utf-8"> - <title>Test microtask suppression</title> - <script src="/tests/SimpleTest/SimpleTest.js"></script> - <link rel="stylesheet" href="/tests/SimpleTest/test.css"/> - <script> - SimpleTest.waitForExplicitFinish(); - - var previousTask = -1; - function test() { - let win = window.open("about:blank"); - win.onload = function() { - win.onmessage = function() { - win.start = win.performance.now(); - win.didRunMicrotask = false; - win.onmessage = function() { - ok(win.didRunMicrotask, "Should have run a microtask."); - let period = win.performance.now() - win.start; - win.opener.ok( - period < 200, - "Running a task should be fast. Took " + period + "ms."); - win.onmessage = null; - } - win.queueMicrotask(function() { win.didRunMicrotask = true; }); - win.postMessage("measurementMessage", "*"); - } - win.postMessage("initialMessage", "*"); - - const last = 500000; - for (let i = 0; i < last + 1; ++i) { - window.queueMicrotask(function() { - // Check that once microtasks are unsuppressed, they are handled in - // the correct order. - if (previousTask != i - 1) { - // Explicitly optimize out cases which pass. - ok(false, "Microtasks should be handled in order."); - } - previousTask = i; - if (i == last) { - win.close(); - SimpleTest.finish(); - } - }); - } - - // Synchronous XMLHttpRequest suppresses microtasks. - var xhr = new XMLHttpRequest(); - xhr.open("GET", "slow.sjs", false); - xhr.send(); - is(previousTask, -1, "Shouldn't have run microtasks during a sync XHR."); - } - } - </script> -</head> -<body onload="test()"> -<p id="display"></p> -<div id="content" style="display: none"></div> -<pre id="test"></pre> -</body> -</html> diff --git a/dom/workers/RuntimeService.cpp b/dom/workers/RuntimeService.cpp index c3e3f56834d7..3fda0a78fd23 100644 --- a/dom/workers/RuntimeService.cpp +++ b/dom/workers/RuntimeService.cpp @@ -931,7 +931,7 @@ class WorkerJSContext final : public mozilla::CycleCollectedJSContext { MOZ_ASSERT(!NS_IsMainThread()); MOZ_ASSERT(runnable); - std::deque<RefPtr<MicroTaskRunnable>>* microTaskQueue = nullptr; + std::queue<RefPtr<MicroTaskRunnable>>* microTaskQueue = nullptr; JSContext* cx = Context(); NS_ASSERTION(cx, "This should never be null!"); @@ -953,7 +953,7 @@ class WorkerJSContext final : public mozilla::CycleCollectedJSContext { } JS::JobQueueMayNotBeEmpty(cx); - microTaskQueue->push_back(std::move(runnable)); + microTaskQueue->push(std::move(runnable)); } bool IsSystemCaller() const override { diff --git a/dom/workers/WorkerPrivate.cpp b/dom/workers/WorkerPrivate.cpp index 506ef24185c4..6907a3ae816c 100644 --- a/dom/workers/WorkerPrivate.cpp +++ b/dom/workers/WorkerPrivate.cpp @@ -4313,7 +4313,7 @@ void WorkerPrivate::EnterDebuggerEventLoop() { { MutexAutoLock lock(mMutex); - std::deque<RefPtr<MicroTaskRunnable>>& debuggerMtQueue = + std::queue<RefPtr<MicroTaskRunnable>>& debuggerMtQueue = ccjscx->GetDebuggerMicroTaskQueue(); while (mControlQueue.IsEmpty() && !(debuggerRunnablesPending = !mDebuggerQueue.IsEmpty()) && diff --git a/dom/worklet/WorkletThread.cpp b/dom/worklet/WorkletThread.cpp index fae1a1c550d1..c672dfb21b8b 100644 --- a/dom/worklet/WorkletThread.cpp +++ b/dom/worklet/WorkletThread.cpp @@ -159,7 +159,7 @@ class WorkletJSContext final : public CycleCollectedJSContext { #endif JS::JobQueueMayNotBeEmpty(cx); - GetMicroTaskQueue().push_back(std::move(runnable)); + GetMicroTaskQueue().push(std::move(runnable)); } bool IsSystemCaller() const override { diff --git a/xpcom/base/CycleCollectedJSContext.cpp b/xpcom/base/CycleCollectedJSContext.cpp index 0a35a5cf5524..347f15c82322 100644 --- a/xpcom/base/CycleCollectedJSContext.cpp +++ b/xpcom/base/CycleCollectedJSContext.cpp @@ -61,7 +61,6 @@ CycleCollectedJSContext::CycleCollectedJSContext() mDoingStableStates(false), mTargetedMicroTaskRecursionDepth(0), mMicroTaskLevel(0), - mSuppressionGeneration(0), mDebuggerRecursionDepth(0), mMicroTaskRecursionDepth(0), mFinalizationRegistryCleanup(this) { @@ -292,7 +291,7 @@ class CycleCollectedJSContext::SavedMicroTaskQueue private: CycleCollectedJSContext* ccjs; - std::deque<RefPtr<MicroTaskRunnable>> mQueue; + std::queue<RefPtr<MicroTaskRunnable>> mQueue; }; js::UniquePtr<JS::JobQueue::SavedJobQueue> @@ -380,13 +379,13 @@ void CycleCollectedJSContext::SetPendingException(Exception* aException) { mPendingException = aException; } -std::deque<RefPtr<MicroTaskRunnable>>& +std::queue<RefPtr<MicroTaskRunnable>>& CycleCollectedJSContext::GetMicroTaskQueue() { MOZ_ASSERT(mJSContext); return mPendingMicroTaskRunnables; } -std::deque<RefPtr<MicroTaskRunnable>>& +std::queue<RefPtr<MicroTaskRunnable>>& CycleCollectedJSContext::GetDebuggerMicroTaskQueue() { MOZ_ASSERT(mJSContext); return mDebuggerMicroTaskQueue; @@ -563,7 +562,7 @@ void CycleCollectedJSContext::DispatchToMicroTask( JS::JobQueueMayNotBeEmpty(Context()); LogMicroTaskRunnable::LogDispatch(runnable.get()); - mPendingMicroTaskRunnables.push_back(std::move(runnable)); + mPendingMicroTaskRunnables.push(std::move(runnable)); } class AsyncMutationHandler final : public mozilla::Runnable { @@ -582,25 +581,6 @@ class AsyncMutationHandler final : public mozilla::Runnable { } }; -SuppressedMicroTasks::SuppressedMicroTasks(CycleCollectedJSContext* aContext) - : mContext(aContext), - mSuppressionGeneration(aContext->mSuppressionGeneration) {} - -bool SuppressedMicroTasks::Suppressed() { - if (mSuppressionGeneration == mContext->mSuppressionGeneration) { - return true; - } - - for (std::deque<RefPtr<MicroTaskRunnable>>::reverse_iterator it = - mSuppressedMicroTaskRunnables.rbegin(); - it != mSuppressedMicroTaskRunnables.rend(); ++it) { - mContext->GetMicroTaskQueue().push_front(*it); - } - mContext->mSuppressedMicroTasks = nullptr; - - return false; -} - bool CycleCollectedJSContext::PerformMicroTaskCheckPoint(bool aForce) { if (mPendingMicroTaskRunnables.empty() && mDebuggerMicroTaskQueue.empty()) { AfterProcessMicrotasks(); @@ -636,14 +616,15 @@ bool CycleCollectedJSContext::PerformMicroTaskCheckPoint(bool aForce) { bool didProcess = false; AutoSlowOperation aso; + std::queue<RefPtr<MicroTaskRunnable>> suppressed; for (;;) { RefPtr<MicroTaskRunnable> runnable; if (!mDebuggerMicroTaskQueue.empty()) { runnable = std::move(mDebuggerMicroTaskQueue.front()); - mDebuggerMicroTaskQueue.pop_front(); + mDebuggerMicroTaskQueue.pop(); } else if (!mPendingMicroTaskRunnables.empty()) { runnable = std::move(mPendingMicroTaskRunnables.front()); - mPendingMicroTaskRunnables.pop_front(); + mPendingMicroTaskRunnables.pop(); } else { break; } @@ -654,16 +635,10 @@ bool CycleCollectedJSContext::PerformMicroTaskCheckPoint(bool aForce) { // all suppressed tasks in mDebuggerMicroTaskQueue unexpectedly. MOZ_ASSERT(NS_IsMainThread()); JS::JobQueueMayNotBeEmpty(Context()); - if (runnable != mSuppressedMicroTasks) { - if (!mSuppressedMicroTasks) { - mSuppressedMicroTasks = new SuppressedMicroTasks(this); - } - mSuppressedMicroTasks->mSuppressedMicroTaskRunnables.push_back( - runnable); - } + suppressed.push(runnable); } else { if (mPendingMicroTaskRunnables.empty() && - mDebuggerMicroTaskQueue.empty() && !mSuppressedMicroTasks) { + mDebuggerMicroTaskQueue.empty() && suppressed.empty()) { JS::JobQueueIsEmpty(Context()); } didProcess = true; @@ -678,9 +653,7 @@ bool CycleCollectedJSContext::PerformMicroTaskCheckPoint(bool aForce) { // Note, it is possible that we end up keeping these suppressed tasks around // for some time, but no longer than spinning the event loop nestedly // (sync XHR, alert, etc.) - if (mSuppressedMicroTasks) { - mPendingMicroTaskRunnables.push_back(mSuppressedMicroTasks); - } + mPendingMicroTaskRunnables.swap(suppressed); AfterProcessMicrotasks(); @@ -695,7 +668,7 @@ void CycleCollectedJSContext::PerformDebuggerMicroTaskCheckpoint() { for (;;) { // For a debugger microtask checkpoint, we always use the debugger microtask // queue. - std::deque<RefPtr<MicroTaskRunnable>>* microtaskQueue = + std::queue<RefPtr<MicroTaskRunnable>>* microtaskQueue = &GetDebuggerMicroTaskQueue(); if (microtaskQueue->empty()) { @@ -708,7 +681,7 @@ void CycleCollectedJSContext::PerformDebuggerMicroTaskCheckpoint() { LogMicroTaskRunnable::Run log(runnable.get()); // This function can re-enter, so we remove the element before calling. - microtaskQueue->pop_front(); + microtaskQueue->pop(); if (mPendingMicroTaskRunnables.empty() && mDebuggerMicroTaskQueue.empty()) { JS::JobQueueIsEmpty(Context()); diff --git a/xpcom/base/CycleCollectedJSContext.h b/xpcom/base/CycleCollectedJSContext.h index 116bff1c90c8..769b000418ab 100644 --- a/xpcom/base/CycleCollectedJSContext.h +++ b/xpcom/base/CycleCollectedJSContext.h @@ -7,7 +7,7 @@ #ifndef mozilla_CycleCollectedJSContext_h #define mozilla_CycleCollectedJSContext_h -#include <deque> +#include <queue> #include "mozilla/Attributes.h" #include "mozilla/MemoryReporting.h" @@ -81,20 +81,6 @@ class MicroTaskRunnable { virtual ~MicroTaskRunnable() = default; }; -// Store the suppressed mictotasks in another microtask so that operations -// for the microtask queue as a whole keep working. -class SuppressedMicroTasks : public MicroTaskRunnable { - public: - explicit SuppressedMicroTasks(CycleCollectedJSContext* aContext); - - MOZ_CAN_RUN_SCRIPT_BOUNDARY void Run(AutoSlowOperation& aAso) final {} - virtual bool Suppressed(); - - CycleCollectedJSContext* mContext; - uint64_t mSuppressionGeneration; - std::deque<RefPtr<MicroTaskRunnable>> mSuppressedMicroTaskRunnables; -}; - // Support for JS FinalizationRegistry objects, which allow a JS callback to be // registered that is called when objects die. // @@ -131,7 +117,6 @@ class FinalizationRegistryCleanup { class CycleCollectedJSContext : dom::PerThreadAtomCache, private JS::JobQueue { friend class CycleCollectedJSRuntime; - friend class SuppressedMicroTasks; protected: CycleCollectedJSContext(); @@ -181,8 +166,8 @@ class CycleCollectedJSContext : dom::PerThreadAtomCache, private JS::JobQueue { already_AddRefed<dom::Exception> GetPendingException() const; void SetPendingException(dom::Exception* aException); - std::deque<RefPtr<MicroTaskRunnable>>& GetMicroTaskQueue(); - std::deque<RefPtr<MicroTaskRunnable>>& GetDebuggerMicroTaskQueue(); + std::queue<RefPtr<MicroTaskRunnable>>& GetMicroTaskQueue(); + std::queue<RefPtr<MicroTaskRunnable>>& GetDebuggerMicroTaskQueue(); JSContext* Context() const { MOZ_ASSERT(mJSContext); @@ -198,8 +183,6 @@ class CycleCollectedJSContext : dom::PerThreadAtomCache, private JS::JobQueue { mTargetedMicroTaskRecursionDepth = aDepth; } - void UpdateMicroTaskSuppressionGeneration() { ++mSuppressionGeneration; } - protected: JSContext* MaybeContext() const { return mJSContext; } @@ -333,10 +316,8 @@ class CycleCollectedJSContext : dom::PerThreadAtomCache, private JS::JobQueue { uint32_t mMicroTaskLevel; - std::deque<RefPtr<MicroTaskRunnable>> mPendingMicroTaskRunnables; - std::deque<RefPtr<MicroTaskRunnable>> mDebuggerMicroTaskQueue; - RefPtr<SuppressedMicroTasks> mSuppressedMicroTasks; - uint64_t mSuppressionGeneration; + std::queue<RefPtr<MicroTaskRunnable>> mPendingMicroTaskRunnables; + std::queue<RefPtr<MicroTaskRunnable>> mDebuggerMicroTaskQueue; // How many times the debugger has interrupted execution, possibly creating // microtask checkpoints in places that they would not normally occur.

1 0

[tor-browser/tor-browser-91.6.0esr-11.5-1] Bug 24796 - Comment out excess permissions from GeckoView
by richard＠torproject.org 09 Feb '22

09 Feb '22

commit ea96fafdaeb8d4c7e417681b330e0330c9af7681 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Wed Apr 11 17:52:59 2018 +0000 Bug 24796 - Comment out excess permissions from GeckoView The GeckoView AndroidManifest.xml is not preprocessed unlike Fennec's manifest, so we can't use the ifdef preprocessor guards around the permissions we do not want. Commenting the permissions is the next-best-thing. --- .../android/geckoview/src/main/AndroidManifest.xml | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/mobile/android/geckoview/src/main/AndroidManifest.xml b/mobile/android/geckoview/src/main/AndroidManifest.xml index a76b6a4754b6..7a2f30708fc3 100644 --- a/mobile/android/geckoview/src/main/AndroidManifest.xml +++ b/mobile/android/geckoview/src/main/AndroidManifest.xml @@ -6,20 +6,32 @@ <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.mozilla.geckoview"> + +  + <uses-permission android:name="android.permission.INTERNET"/> <uses-permission android:name="android.permission.WAKE_LOCK"/> <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" /> + +  + <uses-feature android:name="android.hardware.touchscreen" android:required="false"/> + +  +  +  <uses-feature

1 0

[tor-browser/tor-browser-91.6.0esr-11.5-1] Bug 16439: Remove screencasting code
by richard＠torproject.org 09 Feb '22

09 Feb '22

commit 28d36e0ac9eec25601b11c8816b02f49cf9f7498 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Jun 24 11:01:11 2015 -0400 Bug 16439: Remove screencasting code We avoid including the screencasting code on mobile (it got ripped out for desktop in bug 1393582) by simply excluding the related JS modules from Tor Browser. --- toolkit/modules/moz.build | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/toolkit/modules/moz.build b/toolkit/modules/moz.build index 8ac56c81e646..3fb050b5d18b 100644 --- a/toolkit/modules/moz.build +++ b/toolkit/modules/moz.build @@ -255,10 +255,11 @@ if "Android" != CONFIG["OS_TARGET"]: ] else: DEFINES["ANDROID"] = True - EXTRA_JS_MODULES += [ - "secondscreen/RokuApp.jsm", - "secondscreen/SimpleServiceDiscovery.jsm", - ] + if not CONFIG["TOR_BROWSER_VERSION"]: + EXTRA_JS_MODULES += [ + "secondscreen/RokuApp.jsm", + "secondscreen/SimpleServiceDiscovery.jsm", + ] if CONFIG["MOZ_WIDGET_TOOLKIT"] == "windows":

1 0

[tor-browser/tor-browser-91.6.0esr-11.5-1] Bug 25741 - TBA: Disable GeckoNetworkManager
by richard＠torproject.org 09 Feb '22

09 Feb '22

commit f9c9cb2b54b27d557caee71aec19405da9508b0b Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Thu Apr 26 22:22:51 2018 +0000 Bug 25741 - TBA: Disable GeckoNetworkManager The browser should not need information related to the network interface or network state, tor should take care of that. --- .../src/main/java/org/mozilla/geckoview/GeckoRuntime.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntime.java b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntime.java index f084b522ad53..b94d8e803b6b 100644 --- a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntime.java +++ b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntime.java @@ -122,7 +122,9 @@ public final class GeckoRuntime implements Parcelable { mPaused = false; // Monitor network status and send change notifications to Gecko // while active. - GeckoNetworkManager.getInstance().start(GeckoAppShell.getApplicationContext()); + if (BuildConfig.TOR_BROWSER_VERSION == "") { + GeckoNetworkManager.getInstance().start(GeckoAppShell.getApplicationContext()); + } } @OnLifecycleEvent(Lifecycle.Event.ON_PAUSE) @@ -130,7 +132,9 @@ public final class GeckoRuntime implements Parcelable { Log.d(LOGTAG, "Lifecycle: onPause"); mPaused = true; // Stop monitoring network status while inactive. - GeckoNetworkManager.getInstance().stop(); + if (BuildConfig.TOR_BROWSER_VERSION == "") { + GeckoNetworkManager.getInstance().stop(); + } GeckoThread.onPause(); } }

1 0

[tor-browser/tor-browser-91.6.0esr-11.5-1] Bug 40166: Disable security.certerrors.mitm.auto_enable_enterprise_roots
by richard＠torproject.org 09 Feb '22

09 Feb '22

commit 8665b764781e1136677c1783330d3170455a6beb Author: Alex Catarineu <acat(a)torproject.org> Date: Fri Oct 9 12:55:35 2020 +0200 Bug 40166: Disable security.certerrors.mitm.auto_enable_enterprise_roots --- browser/components/BrowserGlue.jsm | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/browser/components/BrowserGlue.jsm b/browser/components/BrowserGlue.jsm index d23d72a1afc8..0b6a4506b80d 100644 --- a/browser/components/BrowserGlue.jsm +++ b/browser/components/BrowserGlue.jsm @@ -1352,6 +1352,20 @@ BrowserGlue.prototype = { // handle any UI migration this._migrateUI(); + // Clear possibly auto enabled enterprise_roots prefs (see bug 40166) + if ( + !Services.prefs.getBoolPref( + "security.certerrors.mitm.auto_enable_enterprise_roots" + ) && + Services.prefs.getBoolPref( + "security.enterprise_roots.auto-enabled", + false + ) + ) { + Services.prefs.clearUserPref("security.enterprise_roots.enabled"); + Services.prefs.clearUserPref("security.enterprise_roots.auto-enabled"); + } + if (!Services.prefs.prefHasUserValue(PREF_PDFJS_ISDEFAULT_CACHE_STATE)) { PdfJs.checkIsDefault(this._isNewProfile); }

1 0

[tor-browser/tor-browser-91.6.0esr-11.5-1] Bug 28125 - Prevent non-Necko network connections
by richard＠torproject.org 09 Feb '22

09 Feb '22

commit e46b6e6e2e79ffe73eff394a5213008befcf6994 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Thu Oct 25 19:17:09 2018 +0000 Bug 28125 - Prevent non-Necko network connections --- .../gecko/media/GeckoMediaDrmBridgeV21.java | 49 +--------------------- .../exoplayer2/upstream/DefaultHttpDataSource.java | 47 ++------------------- 2 files changed, 4 insertions(+), 92 deletions(-) diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/media/GeckoMediaDrmBridgeV21.java b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/media/GeckoMediaDrmBridgeV21.java index 6e75e6fb4dd5..7faa9bc2821d 100644 --- a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/media/GeckoMediaDrmBridgeV21.java +++ b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/media/GeckoMediaDrmBridgeV21.java @@ -490,54 +490,7 @@ public class GeckoMediaDrmBridgeV21 implements GeckoMediaDrm { @Override protected Void doInBackground(final Void... params) { - HttpURLConnection urlConnection = null; - BufferedReader in = null; - try { - final URI finalURI = new URI(mURL + "&signedRequest=" + URLEncoder.encode(new String(mDrmRequest), "UTF-8")); - urlConnection = (HttpURLConnection) ProxySelector.openConnectionWithProxy(finalURI); - urlConnection.setRequestMethod("POST"); - if (DEBUG) Log.d(LOGTAG, "Provisioning, posting url =" + finalURI.toString()); - - // Add data - urlConnection.setRequestProperty("Accept", "*/*"); - urlConnection.setRequestProperty("User-Agent", getCDMUserAgent()); - urlConnection.setRequestProperty("Content-Type", "application/json"); - - // Execute HTTP Post Request - urlConnection.connect(); - - final int responseCode = urlConnection.getResponseCode(); - if (responseCode == HttpURLConnection.HTTP_OK) { - in = new BufferedReader(new InputStreamReader(urlConnection.getInputStream(), UTF_8)); - String inputLine; - final StringBuffer response = new StringBuffer(); - - while ((inputLine = in.readLine()) != null) { - response.append(inputLine); - } - in.close(); - mResponseBody = String.valueOf(response).getBytes(UTF_8); - if (DEBUG) Log.d(LOGTAG, "Provisioning, response received."); - if (mResponseBody != null) Log.d(LOGTAG, "response length=" + mResponseBody.length); - } else { - Log.d(LOGTAG, "Provisioning, server returned HTTP error code :" + responseCode); - } - } catch (final IOException e) { - Log.e(LOGTAG, "Got exception during posting provisioning request ...", e); - } catch (final URISyntaxException e) { - Log.e(LOGTAG, "Got exception during creating uri ...", e); - } finally { - if (urlConnection != null) { - urlConnection.disconnect(); - } - try { - if (in != null) { - in.close(); - } - } catch (final IOException e) { - Log.e(LOGTAG, "Exception during closing in ...", e); - } - } + Log.i(LOGTAG, "This is Tor Browser. Skipping."); return null; } diff --git a/mobile/android/geckoview/src/thirdparty/java/org/mozilla/thirdparty/com/google/android/exoplayer2/upstream/DefaultHttpDataSource.java b/mobile/android/geckoview/src/thirdparty/java/org/mozilla/thirdparty/com/google/android/exoplayer2/upstream/DefaultHttpDataSource.java index 6e5095b0a4c9..a585e283ed4e 100644 --- a/mobile/android/geckoview/src/thirdparty/java/org/mozilla/thirdparty/com/google/android/exoplayer2/upstream/DefaultHttpDataSource.java +++ b/mobile/android/geckoview/src/thirdparty/java/org/mozilla/thirdparty/com/google/android/exoplayer2/upstream/DefaultHttpDataSource.java @@ -46,6 +46,7 @@ import java.util.regex.Pattern; import java.util.zip.GZIPInputStream; import org.mozilla.gecko.util.ProxySelector; + /** * An {@link HttpDataSource} that uses Android's {@link HttpURLConnection}. * @@ -516,50 +517,8 @@ public class DefaultHttpDataSource extends BaseDataSource implements HttpDataSou boolean followRedirects, Map<String, String> requestParameters) throws IOException, URISyntaxException { - /** - * Tor Project modified the way the connection object was created. For the sake of - * simplicity, instead of duplicating the whole file we changed the connection object - * to use the ProxySelector. - */ - HttpURLConnection connection = (HttpURLConnection) ProxySelector.openConnectionWithProxy(url.toURI()); - - connection.setConnectTimeout(connectTimeoutMillis); - connection.setReadTimeout(readTimeoutMillis); - - Map<String, String> requestHeaders = new HashMap<>(); - if (defaultRequestProperties != null) { - requestHeaders.putAll(defaultRequestProperties.getSnapshot()); - } - requestHeaders.putAll(requestProperties.getSnapshot()); - requestHeaders.putAll(requestParameters); - - for (Map.Entry<String, String> property : requestHeaders.entrySet()) { - connection.setRequestProperty(property.getKey(), property.getValue()); - } - - if (!(position == 0 && length == C.LENGTH_UNSET)) { - String rangeRequest = "bytes=" + position + "-"; - if (length != C.LENGTH_UNSET) { - rangeRequest += (position + length - 1); - } - connection.setRequestProperty("Range", rangeRequest); - } - connection.setRequestProperty("User-Agent", userAgent); - connection.setRequestProperty("Accept-Encoding", allowGzip ? "gzip" : "identity"); - connection.setInstanceFollowRedirects(followRedirects); - connection.setDoOutput(httpBody != null); - connection.setRequestMethod(DataSpec.getStringForHttpMethod(httpMethod)); - - if (httpBody != null) { - connection.setFixedLengthStreamingMode(httpBody.length); - connection.connect(); - OutputStream os = connection.getOutputStream(); - os.write(httpBody); - os.close(); - } else { - connection.connect(); - } - return connection; + Log.i(TAG, "This is Tor Browser. Skipping."); + throw new IOException(); } /** Creates an {@link HttpURLConnection} that is connected with the {@code url}. */

1 0

[tor-browser/tor-browser-91.6.0esr-11.5-1] Bug 16285: Exclude ClearKey system for now
by richard＠torproject.org 09 Feb '22

09 Feb '22

commit 6480268ab422afe5a05fac21a608d8d940331b39 Author: Georg Koppen <gk(a)torproject.org> Date: Mon May 22 12:44:40 2017 +0000 Bug 16285: Exclude ClearKey system for now In the past the ClearKey system had not been compiled when specifying --disable-eme. But that changed and it is even bundled nowadays (see: Mozilla's bug 1300654). We don't want to ship it right now as the use case for it is not really visible while the code had security vulnerabilities in the past. --- browser/installer/package-manifest.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in index 40de7394e6ee..c64d488c750c 100644 --- a/browser/installer/package-manifest.in +++ b/browser/installer/package-manifest.in @@ -449,8 +449,8 @@ bin/libfreebl_64int_3.so #endif ; media -@RESPATH@/gmp-clearkey/0.1/@DLL_PREFIX@clearkey@DLL_SUFFIX@ -@RESPATH@/gmp-clearkey/0.1/manifest.json +;@RESPATH@/gmp-clearkey/0.1/@DLL_PREFIX@clearkey@DLL_SUFFIX@ +;@RESPATH@/gmp-clearkey/0.1/manifest.json #ifdef MOZ_DMD ; DMD

1 0

[translation/tbmanual-contentspot_completed] new translations in tbmanual-contentspot_completed
by translation＠torproject.org 09 Feb '22

09 Feb '22

commit 146b1636adbc90a755dcd1edf1305e3c576d3a4b Author: Translation commit bot <translation(a)torproject.org> Date: Wed Feb 9 12:17:00 2022 +0000 new translations in tbmanual-contentspot_completed --- contents+tr.po | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/contents+tr.po b/contents+tr.po index 58eacea77c..0b0935c275 100644 --- a/contents+tr.po +++ b/contents+tr.po @@ -434,6 +434,10 @@ msgid "" "mirrors, either through [EFF](https://tor.eff.org) or [Calyx " "Institute](https://tor.calyxinstitute.org)." msgstr "" +"Tor Browser indirmek için resmi web sitesine erişemiyorsanız " +"[EFF](https://tor.eff.org) ya da [Calyx " +"Institute](https://tor.calyxinstitute.org) resmi yansılarını " +"deneyebilirsiniz." #: https//tb-manual.torproject.org/downloading/ #: (content/downloading/contents+en.lrtopic.body) @@ -1261,6 +1265,8 @@ msgid "" "Most [Pluggable Transports](../circumvention), such as obfs4, rely on the " "use of \"bridge\" relays." msgstr "" +"obfs4 gibi [değiştirilebilir taşıyıcıların](../circumvention) çoğu, “köprü” " +"aktarıcılarından yararlanır." #: https//tb-manual.torproject.org/bridges/ #: (content/bridges/contents+en.lrtopic.body) @@ -1705,6 +1711,14 @@ msgid "" " does not clear any private information or unlink your activity, nor does it" " affect your current connections to other websites." msgstr "" +"Bu seçenek, kullandığınız [çıkış aktarıcısı](../about/#how-tor-works) " +"istediğiniz web sitesine bağlanamıyorsa ya da site düzgün yüklenmiyorsa işe " +"yarar. Seçildiğinde, etkin sekme ya da pencerenin yeni bir Tor devresi " +"üzerinden yeniden yüklenmesini sağlar. Aynı web sitesinden açılmış diğer " +"sekme ve pencereler de yeniden yüklendiklerinde bu yeni devreyi kullanır. Bu" +" seçeneğin kullanılması, herhangi bir kişisel bilgiyi temizlemez, " +"işlemlerinizi kesintiye uğratmaz ya da açık olan diğer web sitesi " +"bağlantılarınızı etkilemez." #: https//tb-manual.torproject.org/managing-identities/ #: (content/managing-identities/contents+en.lrtopic.body) @@ -2395,6 +2409,9 @@ msgid "" "some fonts and math symbols are disabled; audio and video (HTML5 media) are " "click-to-play." msgstr "" +"* [HTTPS](../secure-connections) kullanmayan sitelerde JavaScript devre dışı" +" bırakılır. Bazı yazı tipleri ve matematik simgeleri devre dışı bırakılır. " +"Ses ve görüntü (HTML5 ortamları) tıklanıp oynatılabilir." #: https//tb-manual.torproject.org/security-settings/ #: (content/security-settings/contents+en.lrtopic.body)

1 0

[translation/communitytpo-contentspot] new translations in communitytpo-contentspot
by translation＠torproject.org 09 Feb '22

09 Feb '22

commit 4ab2ea45a1965bb83f694c0762a3d910074b03e6 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Feb 9 12:15:10 2022 +0000 new translations in communitytpo-contentspot --- contents+zh-TW.po | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 66 insertions(+), 3 deletions(-) diff --git a/contents+zh-TW.po b/contents+zh-TW.po index a5d9e522e2..63b63a46f4 100644 --- a/contents+zh-TW.po +++ b/contents+zh-TW.po @@ -13,8 +13,8 @@ # Transifex Bot <>, 2022 # Chi-Hsun Tsai, 2022 # erinm, 2022 -# Agustín Wu, 2022 # 揚鈞蘇 <tukishimaaoba(a)gmail.com>, 2022 +# Agustín Wu, 2022 # msgid "" msgstr "" @@ -22,7 +22,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2022-02-04 21:33+UTC\n" "PO-Revision-Date: 2019-12-11 10:50+0000\n" -"Last-Translator: 揚鈞蘇 <tukishimaaoba(a)gmail.com>, 2022\n" +"Last-Translator: Agustín Wu, 2022\n" "Language-Team: Chinese (Taiwan) (https://www.transifex.com/otf/teams/1519/zh_TW/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -3875,6 +3875,8 @@ msgid "" "please [get in touch.](https://lists.torproject.org/cgi-" "bin/mailman/listinfo/ux)" msgstr "" +"我們向來秉持著開放式設計的精神，因此您可以看到我們在開發中國家所舉辦的使用者研究專案，若您想與我們一起執行使用者研究計畫，請[與我們聯繫](https…" +"bin/mailman/listinfo/ux)。" #: https//community.torproject.org/user-research/reports/ #: (content/user-research/reports/contents+en.lrpage.body) @@ -3897,6 +3899,13 @@ msgid "" "PDF](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/reports/20…" "_Tor.pdf?inline=false) |" msgstr "" +"| 論壇結構問卷 | 問卷調查 " +"([.md](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/scripts%20and%20activities/2021/tree-" +"testing-forum.md)) | 線上 | Q221, Q321 | " +"[在Gitlab上閱覽](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/rep…" +"_Tor.pdf) · " +"[下載PDF檔](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/reports…" +"_Tor.pdf?inline=false) |" #: https//community.torproject.org/user-research/reports/ #: (content/user-research/reports/contents+en.lrpage.body) @@ -3907,6 +3916,11 @@ msgid "" "PDF](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/reports/20…" "browser-user-survey-public.pdf?inline=false) |" msgstr "" +"| 洋蔥路由瀏覽器使用者問卷 | 問卷調查 | 線上 | Q121, Q221 | " +"[在Gitlab上閱覽](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/rep…" +"browser-user-survey-public.pdf) · " +"[下載PDF檔](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/reports…" +"browser-user-survey-public.pdf?inline=false) |" #: https//community.torproject.org/user-research/reports/ #: (content/user-research/reports/contents+en.lrpage.body) @@ -3917,6 +3931,11 @@ msgid "" "PDF](https://gitlab.torproject.org/tpo/ux/research/-/raw/master/reports/202…" "snowflake-survey-report.pdf?inline=false) |" msgstr "" +"| Snowflake使用者問卷 | 問卷調查 | 線上 | Q121, Q221 | " +"[在Gitlab上閱覽](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/rep…" +"snowflake-survey-report.pdf) · " +"[下載PDF檔](https://gitlab.torproject.org/tpo/ux/research/-/raw/master/reports/…" +"snowflake-survey-report.pdf?inline=false) |" #: https//community.torproject.org/user-research/reports/ #: (content/user-research/reports/contents+en.lrpage.body) @@ -3927,6 +3946,11 @@ msgid "" "[.pdf](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/reports/2021/User_Research_-" "_Bridges.pdf) |" msgstr "" +"| 探索：取得橋接中繼站 | 使用者探索 " +"([.md](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/scripts%20and%20activities/2020/discovery-" +"bridges.md)) | 線上 | Q420, Q121 | " +"[.pdf](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/reports/2021/User_Research_-" +"_Bridges.pdf) |" #: https//community.torproject.org/user-research/reports/ #: (content/user-research/reports/contents+en.lrpage.body) @@ -3935,6 +3959,9 @@ msgid "" "([.md](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/scripts%20and%20activities/2020/user_demographics-" "en.md)) | Online | 2020 | n/a |" msgstr "" +"| 洋蔥路由使用者人口統計 | 問卷調查 " +"([.md](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/scripts%20and%20activities/2020/user_demographics-" +"en.md)) | 線上 | 2020 | n/a |" #: https//community.torproject.org/user-research/reports/ #: (content/user-research/reports/contents+en.lrpage.body) @@ -3943,6 +3970,9 @@ msgid "" "([.pdf](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/scripts%20and%20activities/2019/2.Tor_Browser_Desktop_-" "_Security_Settings.pdf)) | Multiple locations | 2019 | n/a |" msgstr "" +"| 使用者研究：安全性設定 | 可用性測試 " +"([.pdf](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/scripts%20and%20activities/2019/2.Tor_Browser_Desktop_-" +"_Security_Settings.pdf)) | 多個地點 | 2019 | n/a |" #: https//community.torproject.org/user-research/reports/ #: (content/user-research/reports/contents+en.lrpage.body) @@ -3951,6 +3981,9 @@ msgid "" "([.pdf](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/scripts%20and%20activities/2018/1.India_User_testing_Tor_Launcher_Test.pdf))" " | Mumbai(IN) | Q118 | .pdf |" msgstr "" +"| 洋蔥路由啟動器 | 可用性測試 " +"([.pdf](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/scripts%20and%20activities/2018/1.India_User_testing_Tor_Launcher_Test.pdf))" +" | 孟買(印度) | Q118 | .pdf |" #: https//community.torproject.org/user-research/reports/ #: (content/user-research/reports/contents+en.lrpage.body) @@ -3961,6 +3994,11 @@ msgid "" "[.pdf](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/reports/2018/ur_kenya_2018_Feature_report__Onions_and_Circuit_Display.pdf)" " |" msgstr "" +"| 洋蔥安全性指示器 | 可用性測試 " +"([.pdf](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/scripts%20and%20activities/2018/2.User_testing_.onion_states_Test.pdf))" +" | 孟買(印度)、坎帕拉(烏干達)、瓦倫西亞(西班牙)、孟巴沙(肯亞) | Q118, Q218 | " +"[.pdf](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/reports/2018/ur_kenya_2018_Feature_report__Onions_and_Circuit_Display.pdf)" +" |" #: https//community.torproject.org/user-research/reports/ #: (content/user-research/reports/contents+en.lrpage.body) @@ -3971,6 +4009,11 @@ msgid "" "[.pdf](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/reports/2018/ur_kenya_2018_Feature_report__Onions_and_Circuit_Display.pdf)" " |" msgstr "" +"| 洋蔥路由迴路顯示器 | 可用性測試 " +"([.pdf](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/scripts%20and%20activities/2018/3.User_testing_circuit_display_Test.pdf))" +" | 坎帕拉(烏干達)、奈洛比(肯亞)、孟巴沙(肯亞) | Q118, Q218 | " +"[.pdf](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/reports/2018/ur_kenya_2018_Feature_report__Onions_and_Circuit_Display.pdf)" +" |" #: https//community.torproject.org/user-research/reports/ #: (content/user-research/reports/contents+en.lrpage.body) @@ -3982,6 +4025,11 @@ msgid "" "[.pdf](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/reports/2018/ur_colombia_2018_report_tbb-" "tba.pdf) |" msgstr "" +"| 電腦版洋蔥路由瀏覽器 | 使用者需求探索 " +"([.pdf](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/scripts%20and%20activities/2018/4.00_user_needs_discovery.pdf))" +" | 波哥大(哥倫比亞)、卡利(哥倫比亞)、考卡山谷(哥倫比亞)、坎帕拉(烏干達)、霍依瑪(烏干達)、奈洛比(肯亞) | 2018 | " +"[.pdf](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/reports/2018/ur_colombia_2018_report_tbb-" +"tba.pdf) |" #: https//community.torproject.org/user-research/reports/ #: (content/user-research/reports/contents+en.lrpage.body) @@ -3993,11 +4041,16 @@ msgid "" "[.pdf](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/reports/2018/ur_colombia_2018_report_tbb-" "tba.pdf) |" msgstr "" +"| 安卓版洋蔥路由瀏覽器 | 使用者需求探索 " +"([.pdf](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/scripts%20and%20activities/2018/4.00_user_needs_discovery.pdf))" +" | 波哥大(哥倫比亞)、卡利(哥倫比亞)、考卡山谷(哥倫比亞)、坎帕拉(烏干達)、霍依瑪(烏干達)、奈洛比(肯亞) | 2018 | " +"[.pdf](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/reports/2018/ur_colombia_2018_report_tbb-" +"tba.pdf) |" #: https//community.torproject.org/user-research/reports/ #: (content/user-research/reports/contents+en.lrpage.body) msgid "### Community Research" -msgstr "" +msgstr "### 社群研究" #: https//community.torproject.org/user-research/reports/ #: (content/user-research/reports/contents+en.lrpage.body) @@ -4007,6 +4060,9 @@ msgid "" "censored-continent-2020-07-31.pdf): Cameroon, Nigeria, Uganda and Zimbabwe " "as case studies." msgstr "" +"* [被審查的大陸 - " +"了解非洲地區處於網路審查過濾中的工具使用情況](https://research.torproject.org/techreports/icfp-" +"censored-continent-2020-07-31.pdf)：卡麥倫、奈及利亞、烏干達以及辛巴威的研究個案。" #: https//community.torproject.org/user-research/reports/ #: (content/user-research/reports/contents+en.lrpage.body) @@ -4019,6 +4075,13 @@ msgid "" "[survey](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/reports…" "up_Survey_-_Costa_Rica_-_Internews.md): Costa Rica, 2021." msgstr "" +"* [使用者研究 - " +"洋蔥路由瀏覽器普及情形報告](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/…" +"Tor-" +"CostaRica.md)，是這場[訪談](https://gitlab.torproject.org/tpo/ux/research/-/blob/…" +"up_Interviews_-_Costa_Rica_-" +"_Internews.md)以及[問卷調查](https://gitlab.torproject.org/tpo/ux/research/-/blob…" +"up_Survey_-_Costa_Rica_-_Internews.md)的後續追蹤報告：哥斯大黎加，2021年。" #: https//community.torproject.org/user-research/open/ #: (content/user-research/open/contents+en.lrpage.body)

1 0

[translation/tpo-web] new translations in tpo-web
by translation＠torproject.org 09 Feb '22

09 Feb '22

commit 186f1e7fc1bb7cf15b81b4560407d1c1a18ad151 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Feb 9 11:47:47 2022 +0000 new translations in tpo-web --- contents+zh-TW.po | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/contents+zh-TW.po b/contents+zh-TW.po index 73d3a519ee..52f3c44d1e 100644 --- a/contents+zh-TW.po +++ b/contents+zh-TW.po @@ -1845,7 +1845,7 @@ msgstr "每年贊助50,000到99,999美金之間" msgid "" "Your organization’s logo, linking back to your website, is featured on our " "Membership Program page. We will also engage in social media promotion." -msgstr "" +msgstr "我們會在網站的會員頁面裡，放上您組織的標誌以及指向您組織網站的連結，我們也會利用社群媒體、活動或其他型式進行廣宣。" #: (dynamic) msgid "Green Onion Member" @@ -1859,7 +1859,7 @@ msgstr "每年贊助10,000到49,999美金之間" msgid "" "Your organization’s name, linking back to your website, is featured on our " "Membership Program page." -msgstr "" +msgstr "我們會在網站的會員頁面裡，放上您組織的標誌以及指向您組織網站的連結。" #: (dynamic) msgid "" @@ -1872,6 +1872,7 @@ msgid "" " and our [Statement of " "Values](https://gitweb.torproject.org/community/policies.git/tree/statement…." msgstr "" +"社群是洋蔥路由專案計畫的核心，我們的會員也同意加入我們的社群，因此也同時承諾會遵守洋蔥路由的[行為準則](https://gitweb.torproj…" #: (dynamic) msgid "Shallot Onion Members"

1 0