March 2021 - tbb-commits - lists.torproject.org

[tor-browser-spec/master] Bug 40010: Generalize audit script
by gk＠torproject.org 19 Mar '21

19 Mar '21

commit 68566ac4e7021456026bf057e47a00fa8513d2cf Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Thu Jan 21 21:29:22 2021 +0000 Bug 40010: Generalize audit script --- audits/java_audit.sh | 206 +++++++++++++++++++++++++++++++++++---------------- 1 file changed, 142 insertions(+), 64 deletions(-) diff --git a/audits/java_audit.sh b/audits/java_audit.sh old mode 100644 new mode 100755 index b1183eb..3586470 --- a/audits/java_audit.sh +++ b/audits/java_audit.sh @@ -1,90 +1,168 @@ #!/bin/bash -e -if [ $# -ne 3 ]; then - echo "usage: <path/to/repo> <old commit> <new commit>" +if [ $# -ne 4 ]; then + echo "usage: <path/to/repo> <lang> <old commit> <new commit>" exit 1 fi REPO_DIR=$1 -OLD=$2 -NEW=$3 - -SCOPE="java" # string: this is the java audit -EXT="java kt" +SCOPE=$2 +OLD=$3 +NEW=$4 declare -a KEYWORDS #KEYWORDS+=('\+\+\+\ ') -# URL access -KEYWORDS+=(URLConnection) -KEYWORDS+=(UrlConnectionDownloader) - -# Proxy settings -KEYWORDS+=(ProxySelector) - -# Android and java networking and 3rd party libs -KEYWORDS+=("openConnection\(") -KEYWORDS+=("java.net") -KEYWORDS+=("javax.net") -KEYWORDS+=(android.net) -KEYWORDS+=(android.webkit) - -# Third Party http libs -KEYWORDS+=(ch.boye.httpclientandroidlib.impl.client) -KEYWORDS+=(okhttp) - -# Intents -KEYWORDS+=(IntentHelper) -KEYWORDS+=(openUriExternal) -KEYWORDS+=(getHandlersForMimeType) -KEYWORDS+=(getHandlersForURL) -KEYWORDS+=(getHandlersForIntent) -# KEYOWRDS+=(android.content.Intent) # Common -KEYWORDS+=(startActivity) -KEYWORDS+=(startActivities) -KEYWORDS+=(startBroadcast) -KEYWORDS+=(sendBroadcast) -KEYWORDS+=(sendOrderedBroadcast) -KEYWORDS+=(startService) -KEYWORDS+=(bindService) -KEYWORDS+=(android.app.PendingIntent) -KEYWORDS+=(ActivityHandlerHelper.startIntentAndCatch) -KEYWORDS+=(AppLinksInterceptor) -KEYWORDS+=(AppLinksUseCases) - -# Rust symbols -KEYWORDS+=("connect\(") -KEYWORDS+=("recvmsg\(") -KEYWORDS+=("sendmsg\(") -KEYWORDS+=("::post\(") -KEYWORDS+=("::get\(") - -cd $REPO_DIR - -# Step 1: Generate match pattern based on in-scope keywords +initialize_java_symbols() { + # URL access + KEYWORDS+=(URLConnection) + KEYWORDS+=(UrlConnectionDownloader) + + # Proxy settings + KEYWORDS+=(ProxySelector) + + # Android and java networking and 3rd party libs + KEYWORDS+=("openConnection\(") + KEYWORDS+=("java.net") + KEYWORDS+=("javax.net") + KEYWORDS+=(android.net) + KEYWORDS+=(android.webkit) + + # Third Party http libs + KEYWORDS+=(ch.boye.httpclientandroidlib.impl.client) + KEYWORDS+=(okhttp) + + # Intents + KEYWORDS+=(IntentHelper) + KEYWORDS+=(openUriExternal) + KEYWORDS+=(getHandlersForMimeType) + KEYWORDS+=(getHandlersForURL) + KEYWORDS+=(getHandlersForIntent) + # KEYOWRDS+=(android.content.Intent) # Common + KEYWORDS+=(startActivity) + KEYWORDS+=(startActivities) + KEYWORDS+=(startBroadcast) + KEYWORDS+=(sendBroadcast) + KEYWORDS+=(sendOrderedBroadcast) + KEYWORDS+=(startService) + KEYWORDS+=(bindService) + KEYWORDS+=(android.app.PendingIntent) + KEYWORDS+=(ActivityHandlerHelper.startIntentAndCatch) + KEYWORDS+=(AppLinksInterceptor) + KEYWORDS+=(AppLinksUseCases) + KEYWORDS+=(ActivityDelegate) +} + +initialize_rust_symbols() { + KEYWORDS+=("connect\(") + KEYWORDS+=("recvmsg\(") + KEYWORDS+=("sendmsg\(") + KEYWORDS+=("::post\(") + KEYWORDS+=("::get\(") +} + +initialize_cpp_symbols() { + KEYWORDS+=("PR_GetHostByName") + KEYWORDS+=("PR_GetIPNodeByName") + KEYWORDS+=("PR_GetAddrInfoByName") + KEYWORDS+=("PR_StringToNetAddr") + + KEYWORDS+=("MDNS") + KEYWORDS+=("mDNS") + KEYWORDS+=("mdns") + + KEYWORDS+=("TRR") + KEYWORDS+=("trr") + + KEYWORDS+=("AsyncResolve") + KEYWORDS+=("asyncResolve") + KEYWORDS+=("ResolveHost") + KEYWORDS+=("resolveHost") + + KEYWORDS+=("SOCK_") + KEYWORDS+=("SOCKET_") + KEYWORDS+=("_SOCKET") + + KEYWORDS+=("UDPSocket") + KEYWORDS+=("TCPSocket") + + KEYWORDS+=("PR_Socket") + + KEYWORDS+=("SocketProvider") + KEYWORDS+=("udp-socket") + KEYWORDS+=("tcp-socket") + KEYWORDS+=("tcpsocket") + KEYWORDS+=("SOCKET") + KEYWORDS+=("mozilla.org/network") +} + +initialize_js_symbols() { + KEYWORDS+=("AsyncResolve\(") + KEYWORDS+=("asyncResolve\(") + KEYWORDS+=("ResolveHost\(") + KEYWORDS+=("resolveHost\(") + + KEYWORDS+=("udp-socket") + KEYWORDS+=("udpsocket") + KEYWORDS+=("tcp-socket") + KEYWORDS+=("tcpsocket") + KEYWORDS+=("SOCKET") + KEYWORDS+=("mozilla.org/network") +} + +# Step 1: Initialize scope of audit +EXT= +case "${SCOPE}" in + "java" | "kt" | "java-kt" ) + EXT="java kt" + SCOPE="java-kt" + initialize_java_symbols + ;; + "c-cpp" | "c-cxx" | "c" | "cxx" | "cpp" ) + EXT="c cpp h cxx hpp hxx" + SCOPE="c-cpp" + initialize_cpp_symbols + ;; + "rust" ) + EXT="rs" + initialize_rust_symbols + ;; + "js" ) + EXT="js jsm" + initialize_js_symbols + ;; + * ) + echo "requested language not recognized" + exit 1 + ;; +esac + +cd "$REPO_DIR" + +# Step 2: Generate match pattern based on in-scope keywords function join_by { local d=$1; shift; local f=$1; shift; printf %s "$f" "${@/#/$d}"; } -GREP_LINE="$(join_by \| ${KEYWORDS[@]})" +GREP_LINE="$(join_by \| "${KEYWORDS[@]}")" -# Step 2: Obtain patches for all in-scope files where a keyword is present -echo "Diffing patches-${OLD}-${NEW}-${SCOPE}.diff" -path= +# Step 3: Obtain patches for all in-scope files where a keyword is present +declare -a path for ext in ${EXT}; do - path="${path} *.${ext}" + path+=("*.${ext}") done +echo "Diffing patches-${OLD}-${NEW}-${SCOPE}.diff from all ${path[*]} files" # Exclude Deleted and Unmerged files from diff DIFF_FILTER=ACMRTXB -git diff --color=always --color-moved --diff-filter="${DIFF_FILTER}" -U20 -G"${GREP_LINE}" $OLD $NEW -- ${path} > patches-${OLD}-${NEW}-${SCOPE}.diff +git diff --color=always --color-moved --diff-filter="${DIFF_FILTER}" -U20 -G"${GREP_LINE}" "$OLD" "$NEW" -- "${path[@]}" > "patches-${OLD}-${NEW}-${SCOPE}.diff" -# Step 3: Highlight the keyword with an annoying, flashing color +# Step 4: Highlight the keyword with an annoying, flashing color export GREP_COLOR="05;37;41" # Capture the entire file and/or overlap with the previous match, add GREP_COLOR highlighting -egrep -A10000 -B10000 --color=always "${GREP_LINE}" patches-${OLD}-${NEW}-${SCOPE}.diff > keywords-$OLD-$NEW-$SCOPE.diff +grep -A10000 -B10000 --color=always -E "${GREP_LINE}" "patches-${OLD}-${NEW}-${SCOPE}.diff" > "keywords-$OLD-$NEW-$SCOPE.diff" # Add a 'XXX MATCH XXX' at the end of each matched line, easily searchable. -sed -i 's/$\x1b\[05;37;41.*$/\1 XXX MATCH XXX/' keywords-$OLD-$NEW-$SCOPE.diff +sed -i 's/$\x1b\[05;37;41.*$/\1 XXX MATCH XXX/' "keywords-$OLD-$NEW-$SCOPE.diff" -# Step 4: Review the code changes +# Step 5: Review the code changes echo "Diff generated. View it with:" echo " less -R $REPO_DIR/keywords-$OLD-$NEW-$SCOPE.diff"

1 0

[tor-browser-spec/master] Bug 40010: Use full patch diff for code audit
by gk＠torproject.org 19 Mar '21

19 Mar '21

commit 49b2b716aaa4fdc186202584fefccbc1ce62c479 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Thu Jan 21 21:23:21 2021 +0000 Bug 40010: Use full patch diff for code audit --- audits/java_audit.sh | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/audits/java_audit.sh b/audits/java_audit.sh index 1417011..b1183eb 100644 --- a/audits/java_audit.sh +++ b/audits/java_audit.sh @@ -11,6 +11,7 @@ OLD=$2 NEW=$3 SCOPE="java" # string: this is the java audit +EXT="java kt" declare -a KEYWORDS @@ -62,21 +63,28 @@ KEYWORDS+=("::get\(") cd $REPO_DIR -if [ ! -f "release-${OLD}-${NEW}.diff" ]; -then - echo "Diffing release-${OLD}-${NEW}.diff" - git diff --color=always --color-moved $OLD $NEW -U20 > release-${OLD}-${NEW}.diff -fi - -echo "Done with diff" - +# Step 1: Generate match pattern based on in-scope keywords function join_by { local d=$1; shift; local f=$1; shift; printf %s "$f" "${@/#/$d}"; } GREP_LINE="$(join_by \| ${KEYWORDS[@]})" +# Step 2: Obtain patches for all in-scope files where a keyword is present +echo "Diffing patches-${OLD}-${NEW}-${SCOPE}.diff" +path= +for ext in ${EXT}; do + path="${path} *.${ext}" +done +# Exclude Deleted and Unmerged files from diff +DIFF_FILTER=ACMRTXB +git diff --color=always --color-moved --diff-filter="${DIFF_FILTER}" -U20 -G"${GREP_LINE}" $OLD $NEW -- ${path} > patches-${OLD}-${NEW}-${SCOPE}.diff + +# Step 3: Highlight the keyword with an annoying, flashing color export GREP_COLOR="05;37;41" +# Capture the entire file and/or overlap with the previous match, add GREP_COLOR highlighting +egrep -A10000 -B10000 --color=always "${GREP_LINE}" patches-${OLD}-${NEW}-${SCOPE}.diff > keywords-$OLD-$NEW-$SCOPE.diff -# XXX: Arg this sometimes misses file context -egrep -A40 -B40 --color=always "${GREP_LINE}" release-${OLD}-${NEW}.diff > keywords-${OLD}-${NEW}-$SCOPE.diff +# Add a 'XXX MATCH XXX' at the end of each matched line, easily searchable. +sed -i 's/$\x1b\[05;37;41.*$/\1 XXX MATCH XXX/' keywords-$OLD-$NEW-$SCOPE.diff +# Step 4: Review the code changes echo "Diff generated. View it with:" echo " less -R $REPO_DIR/keywords-$OLD-$NEW-$SCOPE.diff"

1 0

[tor-browser-spec/master] Rename java_audit.sh as code_audit.sh
by gk＠torproject.org 19 Mar '21

19 Mar '21

commit a93a6c96555ad0a8816cc08d9006794dc7b29e28 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Tue Feb 2 00:34:57 2021 +0000 Rename java_audit.sh as code_audit.sh --- audits/{java_audit.sh => code_audit.sh} | 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/audits/java_audit.sh b/audits/code_audit.sh similarity index 100% rename from audits/java_audit.sh rename to audits/code_audit.sh

1 0

[tor-browser-spec/master] Clean up java_audit script
by gk＠torproject.org 19 Mar '21

19 Mar '21

commit b5a9016a3d7ca0d6843a357f2ffc0118ad5bfc50 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Thu Jan 21 21:11:55 2021 +0000 Clean up java_audit script --- audits/java_audit.sh | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/audits/java_audit.sh b/audits/java_audit.sh index 51c9bf4..1417011 100644 --- a/audits/java_audit.sh +++ b/audits/java_audit.sh @@ -61,34 +61,22 @@ KEYWORDS+=("::post\(") KEYWORDS+=("::get\(") cd $REPO_DIR -#function join_by { local d=$1; shift; local f=$1; shift; printf %s "$f" "${@/#/ $d}"; } -#GREP_LINE="$(join_by \-G ${KEYWORDS[@]})" - -#base=`git merge-base ${OLD} ${NEW}` if [ ! -f "release-${OLD}-${NEW}.diff" ]; -#if [ ! -f "release-${base}-${NEW}.diff" ]; then echo "Diffing release-${OLD}-${NEW}.diff" - #echo "Diffing release-${base}-${NEW}.diff" git diff --color=always --color-moved $OLD $NEW -U20 > release-${OLD}-${NEW}.diff - #git diff --color=always --color-moved $base $NEW -U20 > release-${base}-${NEW}.diff - #git diff --color=always --color-moved -G${GREP_LINE} $OLD $NEW -U20 > release-${OLD}-${NEW}-G.diff fi echo "Done with diff" function join_by { local d=$1; shift; local f=$1; shift; printf %s "$f" "${@/#/$d}"; } - GREP_LINE="$(join_by \| ${KEYWORDS[@]})" -#GREP_LINE="\+\+\+ |$(join_by \| ${KEYWORDS[@]})" export GREP_COLOR="05;37;41" # XXX: Arg this sometimes misses file context -#egrep -A40 -B40 --color=always "${GREP_LINE}" release-${base}-${NEW}.diff > keywords-${base}-${NEW}-$SCOPE.diff egrep -A40 -B40 --color=always "${GREP_LINE}" release-${OLD}-${NEW}.diff > keywords-${OLD}-${NEW}-$SCOPE.diff echo "Diff generated. View it with:" -#echo " less -R $REPO_DIR/keywords-$base-$NEW-$SCOPE.diff" echo " less -R $REPO_DIR/keywords-$OLD-$NEW-$SCOPE.diff"

1 0

[tor-browser-spec/master] Merge remote-tracking branch 'gitlab/merge-requests/26'
by gk＠torproject.org 19 Mar '21

19 Mar '21

commit 2d8705e699f2bf7a00bc52ca6a38b1b5326b93e4 Merge: 82aa163 6735a8b Author: Georg Koppen <gk(a)torproject.org> Date: Fri Mar 19 21:04:59 2021 +0000 Merge remote-tracking branch 'gitlab/merge-requests/26' audits/NETWORK_AUDIT_RUBRIC | 93 ++++++------------------ audits/code_audit.sh | 168 ++++++++++++++++++++++++++++++++++++++++++++ audits/java_audit.sh | 94 ------------------------- 3 files changed, 190 insertions(+), 165 deletions(-)

1 0

[tor-browser-spec/master] Bug 40016: Add FF87 audit
by gk＠torproject.org 19 Mar '21

19 Mar '21

commit 82aa16329ad0e1e03d2dda72a67c2dd4e47fb8d5 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Mon Mar 15 17:55:22 2021 +0000 Bug 40016: Add FF87 audit --- audits/FF87_NETWORK_AUDIT | 153 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 153 insertions(+) diff --git a/audits/FF87_NETWORK_AUDIT b/audits/FF87_NETWORK_AUDIT new file mode 100644 index 0000000..8874897 --- /dev/null +++ b/audits/FF87_NETWORK_AUDIT @@ -0,0 +1,153 @@ +Start: fe9560804bef331ff346f3fd3b05e74122fdd30b # FIREFOX_86_0_BUILD2 +End: 1be3d58406ce4dd8af63a169482ae4ca1709d8e5 # FIREFOX_87_0b9_BUILD1 + +`git diff fe9560804bef331ff346f3fd3b05e74122fdd30b 1be3d58406ce4dd8af63a169482ae4ca1709d8e5` +and then go over all the changes containing the +below mentioned potentially dangerous calls and features. Grep the diff for +the following strings and examine surrounding usage. + +=============== Native DNS Portion ============= + +PR_GetHostByName +PR_GetIPNodeByName +PR_GetAddrInfoByName +PR_StringToNetAddr (itself is good as it passes AI_NUMERICHOST to getaddrinfo. No resolution.) + +MDNS +TRR (DNS Trusted Recursive Resolver) +Direct Paths to DNS resolution: +nsDNSService::Resolve +nsDNSService::AsyncResolve +nsHostResolver::ResolveHost + +# FF87: +# Bug 902346: +# - Support socks proxy in TCPSocket +# - Review Result: Safe + +# Bug 1684040 +# - Introduce new ODoH class for sending ODoH queries +# - Review Result: Safe (if TRR is safe) + +# Bug 1690615 +# - Move DNS lookup into DnsAndConnectSocket +# - Review Result: Safe + +============ Misc Socket Portion ============== + +SOCK_ +SOCKET_ +_SOCKET + +# FF87: +# Bug 1693270 +# - Switch audioipc-2 to vendored code +# - Review Result: Probably safe. + +UDPSocket +TCPSocket + PR_NewTCPSocket + AsyncTCPSocket + +Misc PR_Socket + +# FF87: Nothing of interest + +=========== Misc XPCOM Portion ================ + +Misc XPCOM (including commands for pre-diff review approach) + *SocketProvider + grep -R udp-socket . + grep -R tcp-socket . + grep for tcpsocket + grep -R "NS_" | grep SOCKET | grep "_C" + grep -R "@mozilla.org/network/" . | grep socket | grep -v udp-socket + +# FF87: Nothing of interest + +============ Rust Portion ================ + +Rust + - XXX: What do we grep for here? Or do we rely on Ritter's compile-time tool? + - Check for new sendmsg and recvmsg usage + +# FF87: Nothing of interest (using `java_audit.sh`) + +============ Android Portion ============= + +Android Java calls + - URLConnection + - XXX: getInputStream? other methods? + - HttpURLConnection + - UrlConnectionDownloader + - ch.boye.httpclientandroidlib.impl.client.* (look for execute() calls) + - grep -n openConnection\( mobile/android/thirdparty/ + - java.net.URL -- has SEVERAL proxy bypass URL fetching methods :/ + - java.net + - javax.net + - ch.boye.httpclientandroidlib.conn.* (esp ssl) + - ch.boye.httpclientandroidlib.impl.conn.* (esp ssl) + - Sudden appearance of thirdparty libs: + - OkHttp + - Retrofit + - Glide + - com.amitshekhar.android + - IntentHelper + - openUriExternal (can come from GeckoAppShell too) + - getHandlersForMimeType + - getHandlersForURL + - getHandlersForIntent + - android.content.Intent - too common; instead find launch methods: + - startActivity + - startActivities + - sendBroadcast + - sendOrderedBroadcast + - startService + - bindService + - android.app.PendingIntent + - android.app.DownloadManager + - ActivityHandlerHelper.startIntentAndCatch + +# FF87: Nothing new (using `java_audit.sh`) + +============ Application Services Portion ============= + +Start: 4cc798c8cd8a1e38ce88e0bb22a05692be63b164 # v67.2.0 +End: 1ee6b32f3ee569036fdf1015cf7ffc01ded2860f # v71.0.0 + +# FF87: Nothing related to networking in Java/Koltlin/Rust code (using `java_audit.sh`) + +============ Android Components Portion ============= + +Start: 095c0ef007ada4dab8561bef69e43bf6db1d3298 # v72.0.15 +End: ecccbf2da2b0572a1d600cce447d47f2eae0de9a # v73.0.3 + +# FF87 (using `java_audit.sh`) +# Commit 6edfec5fe464e4b1d0eb82ed8825526036d861c8 +# - Add prototype component to support Android's autofill framework. +# - Review Result: Conditionally Safe +# - Comments: +# - 1) Hooks into Android's Autofill service +# - 2) Uses PendingIntent, safety depends on usage. Not currently used +# in Fenix. + +# Issue #9417 +# - Add support for sharing actual website images (#9420) +# - Review Result: Patch with external app prompt + +============ Fenix Portion ============= + +Start: db196d0e49eb0f69ab620856491deb8c4c7ccf57 # v86.1.0 +End: 82c8a64ca0b8bd5e6ea88395cba41c0db68d0a36 # v87.0.0-beta.4 + +# FF87: (using `java_audit.sh`) +# - c9b8f57f96e9188746391885a065428df62f3ff9 +# - Refactor BrowserToolbarMenuController to use browser store +# - Review Result: Safe + +============ Regression/Prior Vuln Review ========= + +Review proxy bypass bugs; check for new vectors to look for: + - https://trac.torproject.org/projects/tor/query?keywords=~tbb-proxy + - Look for new features like these. Especially external app launch vectors +

1 0

[Git][tpo/applications/fenix] Pushed new tag tor-browser-87.0.0b2-10.5-1-build1
by Matthew Finkel 19 Mar '21

19 Mar '21

Matthew Finkel pushed new tag tor-browser-87.0.0b2-10.5-1-build1 at The Tor Project / Applications / fenix -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/tree/tor-browser-87.… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[tor-browser/tor-browser-87.0b4-10.5-1] fixup! Bug 10760: Integrate TorButton to TorBrowser core
by sysrqb＠torproject.org 19 Mar '21

19 Mar '21

commit 551b9a51a0c71868107f7cee1016a199e7486baa Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Thu Mar 18 23:19:30 2021 +0000 fixup! Bug 10760: Integrate TorButton to TorBrowser core --- toolkit/torproject/torbutton | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolkit/torproject/torbutton b/toolkit/torproject/torbutton index ba38a0f51e25..772716932a2d 160000 --- a/toolkit/torproject/torbutton +++ b/toolkit/torproject/torbutton @@ -1 +1 @@ -Subproject commit ba38a0f51e2556a896feb0baf1fb4fd7f3970c3b +Subproject commit 772716932a2dd127793b47e91c10691c631b09f4

1 0

[tor-browser-build/master] Release preparations for 10.5a12
by sysrqb＠torproject.org 18 Mar '21

18 Mar '21

commit e32e80bf9c69d6bcd4ed2b06e4181463433fba59 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Thu Mar 18 18:26:19 2021 +0000 Release preparations for 10.5a12 Versions bump and Changelog update --- projects/go/config | 4 +- projects/tba-translation/config | 2 +- .../tor-browser/Bundle-Data/Docs/ChangeLog.txt | 19 ++ projects/tor-browser/allowed_addons.json | 285 +++++++++++---------- projects/tor-browser/config | 4 +- projects/tor/config | 2 +- rbm.conf | 4 +- 7 files changed, 175 insertions(+), 145 deletions(-) diff --git a/projects/go/config b/projects/go/config index b6aaccb..fd37873 100644 --- a/projects/go/config +++ b/projects/go/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 1.15.7 +version: 1.15.10 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' var: @@ -118,7 +118,7 @@ input_files: enable: '[% ! c("var/linux") %]' - URL: 'https://golang.org/dl/go[% c("version") %].src.tar.gz' name: go - sha256sum: 8631b3aafd8ecb9244ec2ffb8a2a8b4983cf4ad15572b9801f7c5b167c1a2abc + sha256sum: c1dbca6e0910b41d61a95bf9878f6d6e93d15d884c226b91d9d4b1113c10dd65 - URL: 'https://golang.org/dl/go[% c("var/go14_version") %].src.tar.gz' name: go14 sha256sum: 9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959 diff --git a/projects/tba-translation/config b/projects/tba-translation/config index 867b0c8..76c8d3f 100644 --- a/projects/tba-translation/config +++ b/projects/tba-translation/config @@ -3,5 +3,5 @@ filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' git_url: https://git.torproject.org/translation.git # We need to bump the commit before releasing but just pointing to a branch # might cause too much rebuidling of the Firefox part. -git_hash: 78436bf799015834e57faccd936f50e3718815be +git_hash: 75a88b97c88d73d0d94a962a75703f0c33f8087c version: '[% c("abbrev") %]' diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 2aba710..09da658 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,22 @@ +Tor Browser 10.5a12 -- March 20 2021 + * Android + * Update Fenix to 87.0.0-beta.2 + * Update NoScript to 11.2.3 + * Update Tor to 0.4.6.1-alpha + * Translations update + * Bug 40030: DuckDuckGo redirect to html doesn't work [torbutton] + * Bug 40043: Rebase android-components patches for Fenix 87 beta 2 builds [android-components] + * Bug 40045: Add External App Prompt for Sharing Images [android-components] + * Bug 40150: Rebase Fenix patches to Fenix 87 beta 2 [fenix] + * Bug 40361: Rebase tor-browser patches to 87.0b4 [tor-browser] + * Build System + * Android + * Update Go to 1.15.10 + * Bug 23631: Use rootless containers [tor-browser-build] + * Bug 40016: getfpaths is not setting origin_project [rbm] + * Bug 40172: Move Gradle compilers out of android-toolchain to own gradle project [tor-browser-build] + * Bug 40241: Update components for mozilla87-based Fenix [tor-browser-build] + Tor Browser 10.0.13 -- March 3 2021 * Linux * Bug 40328: Fix instability after upgrading to glibc 2.33 diff --git a/projects/tor-browser/allowed_addons.json b/projects/tor-browser/allowed_addons.json index 5f6b16f..448ad35 100644 --- a/projects/tor-browser/allowed_addons.json +++ b/projects/tor-browser/allowed_addons.json @@ -12,12 +12,12 @@ { "id": 13299734, "name": "Alexander Shutau", - "url": "https://addons.mozilla.org/en-US/android/user/13299734/", + "url": "https://addons.mozilla.org/en-US/firefox/user/13299734/", "username": "alexanderby", "picture_url": "https://addons.cdn.mozilla.net/user-media/userpics/13/13299/13299734.png?mo…" } ], - "average_daily_users": 597458, + "average_daily_users": 627861, "categories": { "android": [ "experimental", @@ -31,7 +31,7 @@ "contributions_url": "https://opencollective.com/darkreader?utm_content=product-page-contribute&u…", "created": "2017-09-19T07:03:00Z", "current_version": { - "id": 5168569, + "id": 5186492, "compatibility": { "firefox": { "min": "54.0", @@ -42,19 +42,19 @@ "max": "*" } }, - "edit_url": "https://addons.mozilla.org/en-US/developers/addon/darkreader/versions/51685…", + "edit_url": "https://addons.mozilla.org/en-US/developers/addon/darkreader/versions/51864…", "files": [ { - "id": 3712931, - "created": "2021-01-21T17:44:16Z", - "hash": "sha256:3388ad0c1e91e9fcb5103df1286bb5df0caf192aaf2a85a34acb046ca96b78a1", + "id": 3730852, + "created": "2021-02-22T13:24:38Z", + "hash": "sha256:5d6d9059ec8d9c59fa7ecc3c421e1146925d978e9197260124797a6309c9b789", "is_restart_required": false, "is_webextension": true, "is_mozilla_signed_extension": false, "platform": "all", - "size": 518564, + "size": 521677, "status": "public", - "url": "https://addons.mozilla.org/android/downloads/file/3712931/dark_reader-4.9.2…", + "url": "https://addons.mozilla.org/firefox/downloads/file/3730852/dark_reader-4.9.2…", "permissions": [ "storage", "tabs", @@ -97,10 +97,10 @@ "url": "http://www.opensource.org/licenses/mit-license.php" }, "release_notes": { - "en-US": "- Dynamic mode improvements.\n- Thunderbird support.\n- Users' fixes for websites.\n- Users' translation improvements." + "en-US": "- Users' fixes for websites." }, "reviewed": null, - "version": "4.9.27" + "version": "4.9.29" }, "default_locale": "en-US", "description": { @@ -164,7 +164,7 @@ }, "is_disabled": false, "is_experimental": false, - "last_updated": "2021-01-22T09:16:27Z", + "last_updated": "2021-02-22T15:00:21Z", "name": { "ar": "Dark Reader", "bn": "Dark Reader", @@ -237,12 +237,12 @@ "category": "recommended" }, "ratings": { - "average": 4.5619, - "bayesian_average": 4.560258202906761, - "count": 3353, - "text_count": 1102 + "average": 4.564, + "bayesian_average": 4.562562265032526, + "count": 3445, + "text_count": 1134 }, - "ratings_url": "https://addons.mozilla.org/en-US/android/addon/darkreader/reviews/", + "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/darkreader/reviews/", "requires_payment": false, "review_url": "https://addons.mozilla.org/en-US/reviewers/review/855413", "slug": "darkreader", @@ -335,8 +335,9 @@ "theme" ], "type": "extension", - "url": "https://addons.mozilla.org/en-US/android/addon/darkreader/", - "weekly_downloads": 24807 + "url": "https://addons.mozilla.org/en-US/firefox/addon/darkreader/", + "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/darkreader/versions/", + "weekly_downloads": 24316 }, "notes": null }, @@ -347,12 +348,12 @@ { "id": 5474073, "name": "EFF Technologists", - "url": "https://addons.mozilla.org/en-US/android/user/5474073/", + "url": "https://addons.mozilla.org/en-US/firefox/user/5474073/", "username": "eff-technologists", "picture_url": "https://addons.cdn.mozilla.net/user-media/userpics/5/5474/5474073.png?modif…" } ], - "average_daily_users": 752696, + "average_daily_users": 766465, "categories": { "firefox": [ "privacy-security" @@ -384,7 +385,7 @@ "platform": "all", "size": 1748610, "status": "public", - "url": "https://addons.mozilla.org/android/downloads/file/3716461/https_everywhere-…", + "url": "https://addons.mozilla.org/firefox/downloads/file/3716461/https_everywhere-…", "permissions": [ "webNavigation", "webRequest", @@ -405,7 +406,7 @@ "name": { "en-US": "Multiple" }, - "url": "https://addons.mozilla.org/en-US/android/addon/https-everywhere/license/202…" + "url": "https://addons.mozilla.org/en-US/firefox/addon/https-everywhere/license/202…" }, "release_notes": { "en-US": "2021.1.27\n* EASE Mode UI Changes\n* NPM Dependency updates\n* Geckodriver pull update\n* Chromedriver pull update\n* Integrate CSS Grid for Options Page and EASE UI\n* Put Options in new tab" @@ -482,12 +483,12 @@ "category": "recommended" }, "ratings": { - "average": 4.61, - "bayesian_average": 4.6074823945198755, - "count": 2213, - "text_count": 560 + "average": 4.667, + "bayesian_average": 4.6644889312952404, + "count": 2024, + "text_count": 406 }, - "ratings_url": "https://addons.mozilla.org/en-US/android/addon/https-everywhere/reviews/", + "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/https-everywhere/reviews/", "requires_payment": false, "review_url": "https://addons.mozilla.org/en-US/reviewers/review/229918", "slug": "https-everywhere", @@ -518,7 +519,8 @@ ], "type": "extension", "url": "https://www.eff.org/https-everywhere", - "weekly_downloads": 16892 + "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/https-everywhere/versions/", + "weekly_downloads": 21984 }, "notes": null }, @@ -529,12 +531,12 @@ { "id": 6937656, "name": "Thomas Rientjes", - "url": "https://addons.mozilla.org/en-US/android/user/6937656/", + "url": "https://addons.mozilla.org/en-US/firefox/user/6937656/", "username": "Synzvato", "picture_url": "https://addons.cdn.mozilla.net/user-media/userpics/6/6937/6937656.png?modif…" } ], - "average_daily_users": 210128, + "average_daily_users": 215403, "categories": { "android": [ "security-privacy" @@ -569,7 +571,7 @@ "platform": "all", "size": 6857292, "status": "public", - "url": "https://addons.mozilla.org/android/downloads/file/3672658/decentraleyes-2.0…", + "url": "https://addons.mozilla.org/firefox/downloads/file/3672658/decentraleyes-2.0…", "permissions": [ "*://*/*", "privacy", @@ -747,12 +749,12 @@ "category": "recommended" }, "ratings": { - "average": 4.8016, - "bayesian_average": 4.796834743546153, - "count": 1225, - "text_count": 310 + "average": 4.8063, + "bayesian_average": 4.801440211406749, + "count": 1084, + "text_count": 212 }, - "ratings_url": "https://addons.mozilla.org/en-US/android/addon/decentraleyes/reviews/", + "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/decentraleyes/reviews/", "requires_payment": false, "review_url": "https://addons.mozilla.org/en-US/reviewers/review/521554", "slug": "decentraleyes", @@ -844,8 +846,9 @@ "tracking" ], "type": "extension", - "url": "https://addons.mozilla.org/en-US/android/addon/decentraleyes/", - "weekly_downloads": 5661 + "url": "https://addons.mozilla.org/en-US/firefox/addon/decentraleyes/", + "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/decentraleyes/versions/", + "weekly_downloads": 5329 }, "notes": null }, @@ -856,12 +859,12 @@ { "id": 5474073, "name": "EFF Technologists", - "url": "https://addons.mozilla.org/en-US/android/user/5474073/", + "url": "https://addons.mozilla.org/en-US/firefox/user/5474073/", "username": "eff-technologists", "picture_url": "https://addons.cdn.mozilla.net/user-media/userpics/5/5474/5474073.png?modif…" } ], - "average_daily_users": 1014979, + "average_daily_users": 1035509, "categories": { "android": [ "security-privacy" @@ -896,7 +899,7 @@ "platform": "all", "size": 1237132, "status": "public", - "url": "https://addons.mozilla.org/android/downloads/file/3719726/privacy_badger-20…", + "url": "https://addons.mozilla.org/firefox/downloads/file/3719726/privacy_badger-20…", "permissions": [ "tabs", "http://*/*", @@ -1405,12 +1408,12 @@ "category": "recommended" }, "ratings": { - "average": 4.7854, - "bayesian_average": 4.782131767096186, - "count": 1780, - "text_count": 418 + "average": 4.7898, + "bayesian_average": 4.786824489367908, + "count": 1760, + "text_count": 362 }, - "ratings_url": "https://addons.mozilla.org/en-US/android/addon/privacy-badger17/reviews/", + "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/privacy-badger17/reviews/", "requires_payment": false, "review_url": "https://addons.mozilla.org/en-US/reviewers/review/506646", "slug": "privacy-badger17", @@ -1426,8 +1429,9 @@ }, "tags": [], "type": "extension", - "url": "https://addons.mozilla.org/en-US/android/addon/privacy-badger17/", - "weekly_downloads": 37713 + "url": "https://addons.mozilla.org/en-US/firefox/addon/privacy-badger17/", + "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/privacy-badger17/versions/", + "weekly_downloads": 20986 }, "notes": null }, @@ -1438,12 +1442,12 @@ { "id": 11423598, "name": "Raymond Hill", - "url": "https://addons.mozilla.org/en-US/android/user/11423598/", + "url": "https://addons.mozilla.org/en-US/firefox/user/11423598/", "username": "gorhill", "picture_url": null } ], - "average_daily_users": 5065937, + "average_daily_users": 5159942, "categories": { "android": [ "security-privacy" @@ -1455,7 +1459,7 @@ "contributions_url": "", "created": "2015-04-25T07:26:22Z", "current_version": { - "id": 5174693, + "id": 5196606, "compatibility": { "firefox": { "min": "57.0", @@ -1466,19 +1470,19 @@ "max": "*" } }, - "edit_url": "https://addons.mozilla.org/en-US/developers/addon/ublock-origin/versions/51…", + "edit_url": "https://addons.mozilla.org/en-US/developers/addon/ublock-origin/versions/51…", "files": [ { - "id": 3719054, - "created": "2021-02-01T14:04:16Z", - "hash": "sha256:5c3a5ef6f5b5475895053238026360020d6793b05541d20032ea9dd1c9cae451", + "id": 3740966, + "created": "2021-03-10T13:37:51Z", + "hash": "sha256:96783b4e9abed66af81a30f7dbb6560911a9d828b12aadf0ec88b181200c3bfe", "is_restart_required": false, "is_webextension": true, "is_mozilla_signed_extension": false, "platform": "all", - "size": 2742973, + "size": 2758798, "status": "public", - "url": "https://addons.mozilla.org/android/downloads/file/3719054/ublock_origin-1.3…", + "url": "https://addons.mozilla.org/firefox/downloads/file/3740966/ublock_origin-1.3…", "permissions": [ "dns", "menus", @@ -1534,10 +1538,10 @@ "url": "http://www.gnu.org/licenses/gpl-3.0.html" }, "release_notes": { - "en-US": "<a href=\"https://outgoing.prod.mozaws.net/v1/a24fd1d9a1598d49cdc2cdc6d3ecd4359712543…" rel=\"nofollow\">Complete release notes</a>.\n\nClosed as fixed:\n\n<ul><li><a href=\"https://outgoing.prod.mozaws.net/v1/0e94bcfacc284b39a3164377711e52b9ded21cd…" rel=\"nofollow\">After downgrading to 1.32.4, uBO is broken</a></li><li><a href=\"https://outgoing.prod.mozaws.net/v1/88ab9531e629dc0a259dbe61b357b13316fa1a9…" rel=\"nofollow\">Whitelisting a site on Chromium Edge still blocks resources fetched by service worker</a></li></ul>\n<a href=\"https://outgoing.prod.mozaws.net/v1/35c6fcff904629a7392564335b09eb1fe5f661f…" rel=\"nofollow \">Commits history since 1.33.0</a>." + "en-US": "<a href=\"https://outgoing.prod.mozaws.net/v1/993c4844a604f9df4adc7d0327dfedbaacd28a1…" rel=\"nofollow\">Complete release notes</a>.\n\nClosed as fixed:\n\n<ul><li><a href=\"https://outgoing.prod.mozaws.net/v1/cb47cb2c01a2d7d899dd8ef6772c49d6af16956…" rel=\"nofollow\">Picker glitch with elements with special characters in their tag name</a></li><li><a href=\"https://outgoing.prod.mozaws.net/v1/6e6b773c126fb1313b0eb5553db2155115cc012…" rel=\"nofollow\">Expose CNAME-uncloaking as a Privacy option in the Settings pane</a></li><li><a href=\"https://outgoing.prod.mozaws.net/v1/5a91bdb688dcfe2a791c54906113d2130664c9d…" rel=\"nofol low\">Impossible to add explicit exception for implicit strict blocking</a></li><li><a href=\"https://outgoing.prod.mozaws.net/v1/d79b53998d6800c05d5d65263fe4b708b2a9b51…" rel=\"nofollow\">Invalid network filters suggested in element picker</a></li><li><a href=\"https://outgoing.prod.mozaws.net/v1/7f4bccb793a0720711a3e3fe72d3c6104474769…" rel=\"nofollow\">Use +/- in the popup to indicate whether 3-p frames were blocked</a></li></ul>\nNotable commits without en entry in the issue tracker\n\n<ul><li><a href=\"https://outgoing.prod.mozaws.net/v1/719412530be187ade75ed847aac498911d78886…" rel=\"nofollow\">Fix no-scripting switch not working for SVG-based documents</a></li><li><a href=\"https://outgoing.prod. mozaws.net/v1/9369af26872b10a885b78d6a99a5ef102c5bea64d4bd78cc219abcf93c51c…" rel=\"nofollow\">Upgrade CodeMirror to 5.59.2</a></li><li><a href=\"https://outgoing.prod.mozaws.net/v1/fd96d2d87c29688b7d2a7743d0724ea20654338…" rel=\"nofollow\">Fix 'adsbygoogle' neutered script</a></li><li><a href=\"https://outgoing.prod.mozaws.net/v1/a03a3a9cae294846e9071e87f309b72e323e1e0…" rel=\"nofollow\">Inject procedural cosmetic filterer's code only when needed</a></li></ul>\n<a href=\"https://outgoing.prod.mozaws.net/v1/6b8477f5206b215b8e4c77dad49cd5a04bb787c…" rel=\"nofollow\">Commits history since 1.33.2</a>." }, "reviewed": null, - "version": "1.33.2" + "version": "1.34.0" }, "default_locale": "en-US", "description": { @@ -1627,7 +1631,7 @@ }, "is_disabled": false, "is_experimental": false, - "last_updated": "2021-02-17T14:45:13Z", + "last_updated": "2021-03-14T13:25:14Z", "name": { "ar": "uBlock Origin", "bg": "uBlock Origin", @@ -1772,12 +1776,12 @@ "category": "recommended" }, "ratings": { - "average": 4.7339, - "bayesian_average": 4.733470238857273, - "count": 13377, - "text_count": 4446 + "average": 4.7661, + "bayesian_average": 4.765643622144223, + "count": 11416, + "text_count": 3157 }, - "ratings_url": "https://addons.mozilla.org/en-US/android/addon/ublock-origin/reviews/", + "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/ublock-origin/reviews/", "requires_payment": false, "review_url": "https://addons.mozilla.org/en-US/reviewers/review/607454", "slug": "ublock-origin", @@ -1828,8 +1832,9 @@ }, "tags": [], "type": "extension", - "url": "https://addons.mozilla.org/en-US/android/addon/ublock-origin/", - "weekly_downloads": 120361 + "url": "https://addons.mozilla.org/en-US/firefox/addon/ublock-origin/", + "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/ublock-origin/versions/", + "weekly_downloads": 121739 }, "notes": null }, @@ -1840,12 +1845,12 @@ { "id": 11797710, "name": "JanH", - "url": "https://addons.mozilla.org/en-US/android/user/11797710/", + "url": "https://addons.mozilla.org/en-US/firefox/user/11797710/", "username": "JanH", "picture_url": null } ], - "average_daily_users": 67612, + "average_daily_users": 73031, "categories": { "android": [ "photos-media" @@ -1876,7 +1881,7 @@ "platform": "all", "size": 11927, "status": "public", - "url": "https://addons.mozilla.org/android/downloads/file/3630185/videowiedergabe_i…", + "url": "https://addons.mozilla.org/firefox/downloads/file/3630185/videowiedergabe_i…", "permissions": [ "*://*.youtube.com/*", "*://*.youtube-nocookie.com/*", @@ -1958,12 +1963,12 @@ "category": "recommended" }, "ratings": { - "average": 4.5137, - "bayesian_average": 4.508208540483266, - "count": 989, + "average": 4.5177, + "bayesian_average": 4.5127447154833, + "count": 991, "text_count": 375 }, - "ratings_url": "https://addons.mozilla.org/en-US/android/addon/video-background-play-fix/re…", + "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/video-background-play-fix/re…", "requires_payment": false, "review_url": "https://addons.mozilla.org/en-US/reviewers/review/811592", "slug": "video-background-play-fix", @@ -1985,8 +1990,9 @@ "youtube" ], "type": "extension", - "url": "https://addons.mozilla.org/en-US/android/addon/video-background-play-fix/", - "weekly_downloads": 42 + "url": "https://addons.mozilla.org/en-US/firefox/addon/video-background-play-fix/", + "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/video-background-play-fix/ve…", + "weekly_downloads": 39 }, "notes": null }, @@ -1997,12 +2003,12 @@ { "id": 12808157, "name": "cowlicks", - "url": "https://addons.mozilla.org/en-US/android/user/12808157/", + "url": "https://addons.mozilla.org/en-US/firefox/user/12808157/", "username": "cowlicks", "picture_url": null } ], - "average_daily_users": 97387, + "average_daily_users": 98948, "categories": { "android": [ "experimental", @@ -2038,7 +2044,7 @@ "platform": "all", "size": 284724, "status": "public", - "url": "https://addons.mozilla.org/android/downloads/file/3360398/privacy_possum-20…", + "url": "https://addons.mozilla.org/firefox/downloads/file/3360398/privacy_possum-20…", "permissions": [ "tabs", "http://*/*", @@ -2141,12 +2147,12 @@ "category": "recommended" }, "ratings": { - "average": 4.4967, - "bayesian_average": 4.478734818461856, - "count": 300, - "text_count": 83 + "average": 4.4824, + "bayesian_average": 4.466928927858935, + "count": 313, + "text_count": 87 }, - "ratings_url": "https://addons.mozilla.org/en-US/android/addon/privacy-possum/reviews/", + "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/privacy-possum/reviews/", "requires_payment": false, "review_url": "https://addons.mozilla.org/en-US/reviewers/review/953945", "slug": "privacy-possum", @@ -2168,8 +2174,9 @@ "tracking" ], "type": "extension", - "url": "https://addons.mozilla.org/en-US/android/addon/privacy-possum/", - "weekly_downloads": 1341 + "url": "https://addons.mozilla.org/en-US/firefox/addon/privacy-possum/", + "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/privacy-possum/versions/", + "weekly_downloads": 1501 }, "notes": null }, @@ -2180,12 +2187,12 @@ { "id": 12929064, "name": "Armin Sebastian", - "url": "https://addons.mozilla.org/en-US/android/user/12929064/", + "url": "https://addons.mozilla.org/en-US/firefox/user/12929064/", "username": "dessant", "picture_url": "https://addons.cdn.mozilla.net/user-media/userpics/12/12929/12929064.png?mo…" } ], - "average_daily_users": 176675, + "average_daily_users": 183474, "categories": { "android": [ "photos-media", @@ -2222,7 +2229,7 @@ "platform": "all", "size": 653210, "status": "public", - "url": "https://addons.mozilla.org/android/downloads/file/3721973/search_by_image-3…", + "url": "https://addons.mozilla.org/firefox/downloads/file/3721973/search_by_image-3…", "permissions": [ "contextMenus", "storage", @@ -2407,12 +2414,12 @@ "category": "recommended" }, "ratings": { - "average": 4.661, - "bayesian_average": 4.654175268957434, - "count": 826, - "text_count": 169 + "average": 4.6585, + "bayesian_average": 4.652552525120711, + "count": 852, + "text_count": 170 }, - "ratings_url": "https://addons.mozilla.org/en-US/android/addon/search_by_image/reviews/", + "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/search_by_image/reviews/", "requires_payment": false, "review_url": "https://addons.mozilla.org/en-US/reviewers/review/824288", "slug": "search_by_image", @@ -2444,8 +2451,9 @@ "yandex" ], "type": "extension", - "url": "https://addons.mozilla.org/en-US/android/addon/search_by_image/", - "weekly_downloads": 8365 + "url": "https://addons.mozilla.org/en-US/firefox/addon/search_by_image/", + "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/search_by_image/versions/", + "weekly_downloads": 3279 }, "notes": null }, @@ -2456,19 +2464,19 @@ { "id": 13394925, "name": "Thomas Wisniewski", - "url": "https://addons.mozilla.org/en-US/android/user/13394925/", + "url": "https://addons.mozilla.org/en-US/firefox/user/13394925/", "username": "wisniewskit", "picture_url": null }, { "id": 6084813, "name": "Rob W", - "url": "https://addons.mozilla.org/en-US/android/user/6084813/", + "url": "https://addons.mozilla.org/en-US/firefox/user/6084813/", "username": "RobW", "picture_url": null } ], - "average_daily_users": 40775, + "average_daily_users": 45497, "categories": { "android": [ "other" @@ -2499,7 +2507,7 @@ "platform": "all", "size": 13786, "status": "public", - "url": "https://addons.mozilla.org/android/downloads/file/3655036/google_search_fix…", + "url": "https://addons.mozilla.org/firefox/downloads/file/3655036/google_search_fix…", "permissions": [ "webRequest", "webRequestBlocking", @@ -2750,12 +2758,12 @@ "category": "recommended" }, "ratings": { - "average": 4.4416, - "bayesian_average": 4.436088053776032, - "count": 967, - "text_count": 261 + "average": 4.4501, + "bayesian_average": 4.4452079389912384, + "count": 982, + "text_count": 265 }, - "ratings_url": "https://addons.mozilla.org/en-US/android/addon/google-search-fixer/reviews/", + "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/google-search-fixer/reviews/", "requires_payment": false, "review_url": "https://addons.mozilla.org/en-US/reviewers/review/869140", "slug": "google-search-fixer", @@ -2771,8 +2779,9 @@ }, "tags": [], "type": "extension", - "url": "https://addons.mozilla.org/en-US/android/addon/google-search-fixer/", - "weekly_downloads": 42 + "url": "https://addons.mozilla.org/en-US/firefox/addon/google-search-fixer/", + "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/google-search-fixer/versions/", + "weekly_downloads": 63 }, "notes": null }, @@ -2783,12 +2792,12 @@ { "id": 143, "name": "Giorgio Maone", - "url": "https://addons.mozilla.org/en-US/android/user/143/", + "url": "https://addons.mozilla.org/en-US/firefox/user/143/", "username": "giorgio-maone", "picture_url": "https://addons.cdn.mozilla.net/user-media/userpics/0/0/143.png?modified=150…" } ], - "average_daily_users": 406718, + "average_daily_users": 404727, "categories": { "android": [ "performance", @@ -2802,7 +2811,7 @@ "contributions_url": "https://www.paypal.me/NoScript?utm_content=product-page-contribute&utm_medi…", "created": "2005-05-13T10:51:32Z", "current_version": { - "id": 5183180, + "id": 5183628, "compatibility": { "firefox": { "min": "59.0", @@ -2813,19 +2822,19 @@ "max": "*" } }, - "edit_url": "https://addons.mozilla.org/en-US/developers/addon/noscript/versions/5183180", + "edit_url": "https://addons.mozilla.org/en-US/developers/addon/noscript/versions/5183628", "files": [ { - "id": 3727540, - "created": "2021-02-16T15:49:15Z", - "hash": "sha256:1d8126b5b76229d98b7f531879a1f59d16eecca32f8d6cede4d7ff9113f4e41a", + "id": 3727988, + "created": "2021-02-17T06:44:03Z", + "hash": "sha256:eafc5f5be40d33a34d757940b5391455dad166921c880ee67daab056078d51ae", "is_restart_required": false, "is_webextension": true, "is_mozilla_signed_extension": false, "platform": "all", - "size": 609320, + "size": 603728, "status": "public", - "url": "https://addons.mozilla.org/android/downloads/file/3727540/noscript_security…", + "url": "https://addons.mozilla.org/firefox/downloads/file/3727988/noscript_security…", "permissions": [ "contextMenus", "storage", @@ -2872,10 +2881,10 @@ "url": "http://www.gnu.org/licenses/gpl-2.0.html" }, "release_notes": { - "en-US": "v 11.2.2\n============================================================\nx Fixed typo in version checked on noscript capability update.\nx [L10n] Updated bn, br, ca, da, de, el, es, fr, he, is, it, ja, lt, mk, ms, nb, nl, \n pt_BR, ru, sq, sv_SE, tr, zh_CN, zh_TW." + "en-US": "v 11.2.3\n============================================================\nx [L10n] Purged non-inclusive terms from obsolete messages\nx Added red halo feedback in CUSTOM preset for noscript\n element capability\nx Fixed missing red halo feedback in CUSTOM preset for\n inline scripts and other capabilities sometimes\nx Fixed race condition causing noscript elements not to be\n rendered sometimes" }, "reviewed": null, - "version": "11.2.2" + "version": "11.2.3" }, "default_locale": "en-US", "description": { @@ -2925,7 +2934,7 @@ }, "is_disabled": false, "is_experimental": false, - "last_updated": "2021-02-16T23:20:10Z", + "last_updated": "2021-03-16T00:25:13Z", "name": { "de": "NoScript", "el": "NoScript", @@ -3013,12 +3022,12 @@ "category": "recommended" }, "ratings": { - "average": 4.5384, - "bayesian_average": 4.5368145665758375, - "count": 3451, - "text_count": 2375 + "average": 4.3579, + "bayesian_average": 4.355218608658197, + "count": 1749, + "text_count": 718 }, - "ratings_url": "https://addons.mozilla.org/en-US/android/addon/noscript/reviews/", + "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/noscript/reviews/", "requires_payment": false, "review_url": "https://addons.mozilla.org/en-US/reviewers/review/722", "slug": "noscript", @@ -3071,8 +3080,9 @@ "xss" ], "type": "extension", - "url": "https://addons.mozilla.org/en-US/android/addon/noscript/", - "weekly_downloads": 10153 + "url": "https://addons.mozilla.org/en-US/firefox/addon/noscript/", + "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/noscript/versions/", + "weekly_downloads": 10017 }, "notes": null }, @@ -3083,12 +3093,12 @@ { "id": 4010195, "name": "Baris Derin", - "url": "https://addons.mozilla.org/en-US/android/user/4010195/", + "url": "https://addons.mozilla.org/en-US/firefox/user/4010195/", "username": "baris-derin", "picture_url": null } ], - "average_daily_users": 132136, + "average_daily_users": 134503, "categories": { "android": [ "performance", @@ -3125,7 +3135,7 @@ "platform": "all", "size": 234119, "status": "public", - "url": "https://addons.mozilla.org/android/downloads/file/3719055/youtube_high_defi…", + "url": "https://addons.mozilla.org/firefox/downloads/file/3719055/youtube_high_defi…", "permissions": [ "tabs", "storage", @@ -3221,12 +3231,12 @@ "category": "recommended" }, "ratings": { - "average": 4.1111, - "bayesian_average": 4.106908765393005, - "count": 1161, - "text_count": 554 + "average": 3.9134, + "bayesian_average": 3.9089901371236873, + "count": 935, + "text_count": 336 }, - "ratings_url": "https://addons.mozilla.org/en-US/android/addon/youtube-high-definition/revi…", + "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/youtube-high-definition/revi…", "requires_payment": false, "review_url": "https://addons.mozilla.org/en-US/reviewers/review/328839", "slug": "youtube-high-definition", @@ -3261,8 +3271,9 @@ "youtube hd" ], "type": "extension", - "url": "https://addons.mozilla.org/en-US/android/addon/youtube-high-definition/", - "weekly_downloads": 1954 + "url": "https://addons.mozilla.org/en-US/firefox/addon/youtube-high-definition/", + "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/youtube-high-definition/vers…", + "weekly_downloads": 1800 }, "notes": null } diff --git a/projects/tor-browser/config b/projects/tor-browser/config index c316377..29eb20f 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -78,9 +78,9 @@ input_files: enable: '[% c("var/snowflake") && ! c("var/android") %]' - filename: Bundle-Data enable: '[% ! c("var/android") %]' - - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… + - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… name: noscript - sha256sum: 1d8126b5b76229d98b7f531879a1f59d16eecca32f8d6cede4d7ff9113f4e41a + sha256sum: eafc5f5be40d33a34d757940b5391455dad166921c880ee67daab056078d51ae - filename: 'RelativeLink/start-tor-browser.desktop' enable: '[% c("var/linux") %]' - filename: 'RelativeLink/execdesktop' diff --git a/projects/tor/config b/projects/tor/config index ab5458a..ca3f100 100644 --- a/projects/tor/config +++ b/projects/tor/config @@ -1,6 +1,6 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -version: 0.4.5.6 +version: 0.4.6.1-alpha git_hash: 'tor-[% c("version") %]' git_url: https://git.torproject.org/tor.git git_submodule: 1 diff --git a/rbm.conf b/rbm.conf index ba13cc0..fc7c95b 100644 --- a/rbm.conf +++ b/rbm.conf @@ -24,8 +24,8 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '10.5a11' - torbrowser_build: 'build2' + torbrowser_version: '10.5a12' + torbrowser_build: 'build1' torbrowser_incremental_from: - 10.5a8 - 10.5a10

1 0

[torbutton/master] Revert "Bug 40113: Add strings for EOY 2020 campaign"
by sysrqb＠torproject.org 18 Mar '21

18 Mar '21

commit 3d0974c3ba26c9ee234ad1da52c5d0c208c5f557 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Thu Mar 18 23:16:17 2021 +0000 Revert "Bug 40113: Add strings for EOY 2020 campaign" This reverts commit d27b2be209e0fd423dedb4e797abc899f6c60bdd. --- chrome/locale/en-US/aboutTor.dtd | 4 ---- 1 file changed, 4 deletions(-) diff --git a/chrome/locale/en-US/aboutTor.dtd b/chrome/locale/en-US/aboutTor.dtd index 13e2d8a2..7b231095 100644 --- a/chrome/locale/en-US/aboutTor.dtd +++ b/chrome/locale/en-US/aboutTor.dtd @@ -29,7 +29,3 @@ <!ENTITY aboutTor.newsletter.link_text "Sign up for Tor News."> <!ENTITY aboutTor.donationBanner.freeToUse "Tor is free to use because of donations from people like you."> <!ENTITY aboutTor.donationBanner.buttonA "Donate Now"> - - -<!ENTITY aboutTor.ey2020.useamask "Use a mask, use Tor."> -<!ENTITY aboutTor.ey2020.resistsurveillance "Resist the surveillance pandemic.">

1 0