September 2020 - tor-commits - lists.torproject.org

[Git][tpo/applications/fenix][tor-browser-81.1.1-10.0-1] 2 commits: Bug 40059: Use MOZ_BUILD_DATE for versionCode
by Georg Koppen 28 Sep '20

28 Sep '20

Georg Koppen pushed to branch tor-browser-81.1.1-10.0-1 at The Tor Project / Applications / fenix Commits: c8fea7b4 by Georg Koppen at 2020-09-25T14:30:34+00:00 Bug 40059: Use MOZ_BUILD_DATE for versionCode At the same time we adapt MOZ_BUILD_DATE to our needs where it is actually used and not in tor-browser-build. This gives us more flexibility. See: tor-browser-build#40084. - - - - - 0a4fbe8a by Georg Koppen at 2020-09-28T13:43:59+00:00 Merge branch 'bug_40059' into tor-browser-81.1.1-10.0-1 - - - - - 2 changed files: - app/build.gradle - buildSrc/src/main/java/Config.kt Changes: ===================================== app/build.gradle ===================================== @@ -679,9 +679,12 @@ ext.updateExtensionVersion = { task, extDir -> into extDir def systemEnvBuildDate = System.getenv('MOZ_BUILD_DATE') + // MOZ_BUILD_DATE is in the YYYYMMDDHHMMSS format. Thus, we only use a + // substring of it if it is available. def values = ['version': AndroidComponents.VERSION + "." + - (systemEnvBuildDate != null ? systemEnvBuildDate : - new Date().format('MMddHHmmss'))] + (systemEnvBuildDate != null ? + systemEnvBuildDate.substring(4) : + new Date().format('MMddHHmmss'))] inputs.properties(values) expand(values) } ===================================== buildSrc/src/main/java/Config.kt ===================================== @@ -47,7 +47,7 @@ object Config { private val fennecBaseVersionCode by lazy { val format = SimpleDateFormat("YYYYMMDDHHMMSS", Locale.US) val cutoff = format.parse("20150801000000") - val build = Date() + val build = if (System.getenv("MOZ_BUILD_DATE") != null) format.parse(System.getenv("MOZ_BUILD_DATE")) else Date() Math.floor((build.time - cutoff.time) / (1000.0 * 60.0 * 60.0)).toInt() } View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/compare/8b0f722ffcc6… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/compare/8b0f722ffcc6… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[tor-browser-build/master] Merge remote-tracking branch 'gitlab/merge-requests/80' into master
by gk＠torproject.org 28 Sep '20

28 Sep '20

commit b13fc9ac83e49d833dee28621af182e038ad2331 Merge: f879dec f733e4f Author: Georg Koppen <gk(a)torproject.org> Date: Mon Sep 28 13:45:19 2020 +0000 Merge remote-tracking branch 'gitlab/merge-requests/80' into master projects/common/get-moz-build-date | 5 +++-- projects/fenix/build | 3 --- 2 files changed, 3 insertions(+), 5 deletions(-)

1 0

[tor-browser-build/master] Bug 34163: Fix versionCode for testbuilds
by gk＠torproject.org 28 Sep '20

28 Sep '20

commit 691a762b633c16cd7ee00b32f2284cf1bb3e9278 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Sep 25 13:41:53 2020 +0000 Bug 34163: Fix versionCode for testbuilds --- projects/common/get-moz-build-date | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/projects/common/get-moz-build-date b/projects/common/get-moz-build-date index a43f2f7..5932a6f 100755 --- a/projects/common/get-moz-build-date +++ b/projects/common/get-moz-build-date @@ -10,8 +10,9 @@ if ($version =~ m/^tbb-nightly\.([^\.]+)\.([^\.]+)\.([^\.]+)$/) { $date = sprintf("%d%02d%02d010101", $1, $2, $3); } elsif ($version eq 'testbuild') { # There is no need for an increasing build date in test builds. Just hardcode - # it. - $date = 20010101010101; + # it to a value that is compatible with the v1 versionCode scheme on Android, + # see: #34163. + $date = 20150801000000; } else { my @v = split(/[\.ab]/, $version); push @v, '0' if @v < 4;

1 0

[tor-browser-build/master] Bug 40084: Fix AndroidManifest.xml reproducibility
by gk＠torproject.org 28 Sep '20

28 Sep '20

commit f733e4ff08d2f56ca3cf562d006e5c712b4118a8 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Sep 25 14:25:40 2020 +0000 Bug 40084: Fix AndroidManifest.xml reproducibility We need to make sure we just set MOZ_BUILD_DATE and adapt the format where it is actually needed. See: fenix#40059 for the Fenix part that makes use of that to fix #40084. --- projects/fenix/build | 3 --- 1 file changed, 3 deletions(-) diff --git a/projects/fenix/build b/projects/fenix/build index 7569250..eedddcc 100644 --- a/projects/fenix/build +++ b/projects/fenix/build @@ -54,9 +54,6 @@ cp $rootdir/[% c('input_files_by_name/tor-android-service') %]/* app/ then echo "MOZ_BUILD_DATE is not set" exit 1 - else - # We only need a MMddHHmmss format and thus no year. - MOZ_BUILD_DATE=${MOZ_BUILD_DATE:4} fi $GRADLE_HOME/gradle-6.5.1/bin/gradle --offline --no-daemon -Dmaven.repo.local=$gradle_repo app:assemble[% c('variant') %] -x lint

1 0

[tor-browser-build/master] Fold in 10.0 Changelog
by gk＠torproject.org 28 Sep '20

28 Sep '20

commit f879decd41ec0f289edb0ae3188f7a117188315e Author: Georg Koppen <gk(a)torproject.org> Date: Mon Sep 28 13:29:10 2020 +0000 Fold in 10.0 Changelog --- .../tor-browser/Bundle-Data/Docs/ChangeLog.txt | 114 +++++++++++++++++++++ 1 file changed, 114 insertions(+) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 9798767..9f66e55 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -15,6 +15,120 @@ Tor Browser 10.5a1 -- September 22 2020 * Bug 40041: Remove CentOS 6 support for 10.5 series [tor-browser-build] * Bug 40103: Add i386 pkg-config path for linux-i686 [tor-browser-build] +Tor Browser 10.0 -- September 22 2020 + * Windows + OS X + Linux + * Update Firefox to 78.3.0esr + * Update Tor to 0.4.4.5 + * Update Tor Launcher to 0.2.25 + * Bug 32174: Replace XUL <textbox> with <html:input> + * Bug 33890: Rename XUL files to XHTML + * Bug 33862: Fix usages of createTransport API + * Bug 33906: Fix Tor-Launcher issues for Firefox 75 + * Bug 33998: Use CSS grid instead of XUL grid + * Bug 34164: Tor Launcher deadlocks during startup (Firefox 77) + * Bug 34206: Tor Launcher button labels are missing (Firefox 76) + * Bug 40002: After rebasing to 80.0b2 moat is broken [tor-launcher] + * Translations update + * Update NoScript to 11.0.44 + * Bug 40093: Youtube videos on safer produce an error [tor-browser] + * Translations update + * Bug 10394: Let Tor Browser update HTTPS Everywhere + * Bug 11154: Disable TLS 1.0 (and 1.1) by default + * Bug 16931: Sanitize the add-on blocklist update URL + * Bug 17374: Disable 1024-DH Encryption by default + * Bug 21601: Remove unused media.webaudio.enabled pref + * Bug 30682: Disable Intermediate CA Preloading + * Bug 30812: Exempt about: pages from Resist Fingerprinting + * Bug 31918+33533+40024+40037: Rebase Tor Browser esr68 patches for ESR 78 [tor-browser] + * Bug 32612: Update MAR_CHANNEL_ID for the alpha + * Bug 32886: Separate treatment of @media interaction features for desktop and android + * Bug 33534: Review FF release notes from FF69 to latest (FF78) + * Bug 33697: Use old search config based on list.json + * Bug 33721: PDF Viewer is not working in the safest security level + * Bug 33734: Set MOZ_NORMANDY to False + * Bug 33737: Fix aboutDialog.js error for Firefox nightlies + * Bug 33848: Disable Enhanced Tracking Protection + * Bug 33851: Patch out Parental Controls detection and logging + * Bug 33852: Clean up about:logins to not mention Sync + * Bug 33856: Set browser.privatebrowsing.forceMediaMemoryCache to True + * Bug 33862: Fix usages of createTransport API + * Bug 33867: Disable password manager and password generation + * Bug 33890: Rename XUL files to XHTML + * Bug 33892: Add brandProductName to brand.dtd and brand.properties + * Bug 33962: Uplift patch for bug 5741 (dns leak protection) + * Bug 34125: API change in protocolProxyService.registerChannelFilter + * Bug 40001: Generate tor-browser-brand.ftl when importing translations [torbutton] + * Bug 40002: Remove about:pioneer [tor-browser] + * Bug 40002: Fix generateNSGetFactory being moved to ComponentUtils [torbutton] + * Bug 40003: Adapt code for L10nRegistry API changes [torbutton] + * Bug 40005: Initialize the identity UI before setting up the circuit display [torbutton] + * Bug 40006: Fix new identity for 81 [torbutton] + * Bug 40007: Move SecurityPrefs initialization to the StartupObserver component [torbutton] + * Bug 40008: Style fixes for 78 [torbutton] + * Bug 40016: Update Snowflake to discover NAT type [tor-browser-build] + * Bug 40017: Audit Firefox 68-78 diff for proxy issues [tor-browser] + * Bug 40022: Update new icons in Tor Browser branding [tor-browser] + * Bug 40025: Revert add-on permissions due to Mozilla's 1560059 [tor-browser] + * Bug 40036: Remove product version/update channel from #13379 patch [tor-browser] + * Bug 40038: Review RemoteSettings for ESR 78 [tor-browser] + * Bug 40048: Disable various ESR78 features via prefs [tor-browser] + * Bug 40059: Verify our external helper patch is still working [tor-browser] + * Bug 40066: Update existing prefs for ESR 78 [tor-browser] + * Bug 40066: Remove default bridge 37.218.240.34 [tor-browser-build] + * Bug 40073: Disable remote Public Suffix List fetching [tor-browser] + * Bug 40073: Repack omni.ja to include builtin HTTPS Everywhere [tor-browser-build] + * Bug 40078: Backport patches for bug 1651680 for now [tor-browser] + * Bug 40082: Let JavaScript on safest setting handled by NoScript again [tor-browser] + * Bug 40088: Moat "Submit" button does not work + * Bug 40090: Disable v3 add-on blocklist for now [tor-browser] + * Bug 40091: Load HTTPS Everywhere as a builtin addon [tor-browser] + * Bug 40102: Fix UI bugs in Tor Browser 10.0 alpha [tor-browser] + * Bug 40106: Cannot install addons in full screen mode [tor-browser] + * Bug 40109: Playing video breaks after reloading pages [tor-browser] + * Bug 40119: Enable v3 extension blocklisting again [tor-browser] + * Windows + * Bug 33855: Don't use site's icon as window icon in Windows in private mode + * Bug 40061: Omit the Windows default browser agent from the build [tor-browser] + * OS X + * Bug 32252: Tor Browser does not display correctly in VMWare Fusion on macOS (mojave) + * Build System + * Windows + OS X + Linux + * Bump Go to 1.14.7 + * Bug 31845: Bump GCC version to 9.3.0 + * Bug 34011: Bump clang to 9.0.1 + * Bug 34014: Enable sqlite3 support in Python + * Bug 34390: Don't copy DBM libraries anymore + * Bug 34391: Remove unused --enable-signmar option + * Bug 40004: Adapt Rust project for Firefox 78 ESR [tor-browser-build] + * Bug 40005: Adapt Node project for Firefox 78 ESR [tor-browser-build] + * Bug 40006: Adapt cbindgen for Firefox 78 ESR [tor-browser-build] + * Bug 40037: Move projects over to clang-source [tor-browser-build] + * Bug 40026: Fix full .mar creation for esr78 [tor-browser-build] + * Bug 40027: Fix incremental .mar creation for esr78 [tor-browser-build] + * Bug 40028: Do not reference unset env variables [tor-browser-build] + * Bug 40031: Add licenses for kcp-go and smux. [tor-browser-build] + * Bug 40045: Fix complete .mar file creation for dmg2mar [tor-browser-build] + * Bug 40065: Bump debootstrap-image ubuntu_version to 20.04.1 [tor-browser-build] + * Bug 40087: Deterministically add HTTPS Everywhere into omni.ja [tor-browser-build] + * Windows + * Bug 34230: Update Windows toolchain for Firefox 78 ESR + * Bug 40015: Use only 64bit fxc2 [tor-browser-build] + * Bug 40017: Enable stripping again on Windows [tor-browser-build] + * Bug 40052: Bump NSIS to 3.06.1 [tor-browser-build] + * Bug 40061: Omit the Windows default browser agent from the build [tor-browser] + * Bug 40071: Be explicit about no SEH with mingw-w64 on 32bit systems [tor-browser-build] + * Bug 40077: Don't pass --no-insert-timestamp when building Firefox [tor-browser-build] + * Bug 40090: NSIS 3.06.1 based builds are not reproducible anymore [tor-browser-build] + * OS X + * Bug 34229: Update macOS toolchain for Firefox 78 ESR + * Bug 40003: Update cctools version for Firefox 78 ESR [tor-browser-build] + * Bug 40018: Add libtapi project for cctools [tor-browser-build] + * Bug 40019: Ship our own runtime library for macOS [tor-browser-build] + * Linux + * Bug 34359: Adapt abicheck.cc to deal with newer GCC version + * Bug 34386: Fix up clang compilation on Linux + * Bug 40053: Also create the langpacks tarball for non-release builds [tor-browser-build] + Tor Browser 10.0a7 -- September 14 2020 * Windows + OS X + Linux * Update Tor Launcher to 0.2.24

1 0

[torspec/master] Better description for when a consensus must is "too early"
by asn＠torproject.org 28 Sep '20

28 Sep '20

commit 42d0a841acbd2d8f5a7e83a3b8e9425676eb0370 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 18 10:18:06 2020 -0400 Better description for when a consensus must is "too early" Since the authorities can produce a signed consensus as soon as `ValidAfter` minus `DistSeconds`, and since they serve a signed consensus as soon as it has enough signatures, it's possible that a client or relay that's starting late in the hour can get an "early" consensus. Back in tor#25756, we fixed this issue in Tor, but we didn't document the behavior in the spec. --- dir-spec.txt | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/dir-spec.txt b/dir-spec.txt index 7ae5acd..27d380f 100644 --- a/dir-spec.txt +++ b/dir-spec.txt @@ -341,7 +341,8 @@ change does remove one common cause of consensus splits. VA-DistSeconds: The authorities calculate the consensus and exchange - signatures. + signatures. (This is the earliest point at which anybody can + possibly get a given consensus if they ask for it.) VA-DistSeconds/2: The authorities try to download any signatures they don't have. @@ -1752,7 +1753,14 @@ [Exactly once.] The start of the Interval for this vote. Before this time, the - consensus document produced from this vote should not be used. + consensus document produced from this vote is not officially in + use. + + (Note that because of propagation delays, clients and relays + may see consensus documents that are up to `DistSeconds` + earlier than this this time, and should not warn about + them.) + See section 1.4 for voting timeline information. "fresh-until" SP YYYY-MM-DD SP HH:MM:SS NL

1 0

[torspec/master] Merge remote-tracking branch 'tor-gitlab/mr/7' into master
by asn＠torproject.org 28 Sep '20

28 Sep '20

commit e7c9a0110649f688312f8bfc4e37d40dd7ddedb7 Merge: 53df602 42d0a84 Author: George Kadianakis <desnacked(a)riseup.net> Date: Mon Sep 28 16:00:44 2020 +0300 Merge remote-tracking branch 'tor-gitlab/mr/7' into master dir-spec.txt | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)

1 0

[tor/master] Add missing documentation for get_net_param_from_list
by nickm＠torproject.org 28 Sep '20

28 Sep '20

commit e68770719ef4d3d3b83398715b1e10391ab6a1b4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Sep 28 08:41:47 2020 -0400 Add missing documentation for get_net_param_from_list --- src/feature/nodelist/networkstatus.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/feature/nodelist/networkstatus.c b/src/feature/nodelist/networkstatus.c index 9210518de0..ece3c9e059 100644 --- a/src/feature/nodelist/networkstatus.c +++ b/src/feature/nodelist/networkstatus.c @@ -2444,7 +2444,12 @@ networkstatus_getinfo_by_purpose(const char *purpose_string, time_t now) return answer; } -/* DOCDOC get_net_param_from_list */ +/** + * Search through a smartlist of "key=int32" strings for a value beginning + * with "param_name=". If one is found, clip it to be between min_val and + * max_val inclusive and return it. If one is not found, return + * default_val. + ***/ static int32_t get_net_param_from_list(smartlist_t *net_params, const char *param_name, int32_t default_val, int32_t min_val, int32_t max_val)

1 0

[tpo/master] Edit .htaccess for 2020 donate campaign
by hiro＠torproject.org 27 Sep '20

27 Sep '20

commit e7addf02230e6ef19cfc97a3767fcae58c33ecad Author: hiro <hiro(a)torproject.org> Date: Sun Sep 27 19:30:18 2020 +0200 Edit .htaccess for 2020 donate campaign Delete .htaccess-membership --- .htaccess | 62 ++++++++++++++++++++++++++++++++++++++++++++++------ .htaccess-membership | 4 ---- 2 files changed, 55 insertions(+), 11 deletions(-) diff --git a/.htaccess b/.htaccess index 81a71ca6..9f26ed62 100644 --- a/.htaccess +++ b/.htaccess @@ -70,10 +70,6 @@ RewriteRule ^newsletter(.*) https://newsletter.torproject.org [R=302,L] # Press RewriteRule ^press/press(.*) /press [R=302,L] -# Donation campaign -# 2019 -RewriteRule ^donate(.*) https://donate.torproject.org [R=302,L] - # other (feel free to categorize) RewriteRule ^people(.*) /about/people$1 [R=302,L] RewriteRule ^about/contact(.*) /contact$1 [R=302,L] @@ -100,12 +96,9 @@ RewriteRule ^eff/(.*) https://2019.www.torproject.org/eff/$1 [R=302,L] # Videos RewriteRule ^videos/(.*) https://2019.www.torproject.org/videos/$1 [R=302,L] - # Donation campaign # 2017 # Special-case the donate-options and amazon page so it doesn't get redirected -RewriteRule ^donate/donate-options(.*) https://2019.www.torproject.org/donate/donate-options$1 [END] -RewriteRule ^donate/donate-amazon(.*) https://2019.www.torproject.org/donate/donate-amazon$1 [END] RewriteRule ^donate/donate(.*) https://donate.torproject.org [R=302,L] RewriteRule ^donate/donor-faq(.*) https://donate.torproject.org/donor-faq [R=302,L] RewriteRule ^donate/donor-privacy-policy(.*) https://donate.torproject.org/privacy-policy [R=302,L] @@ -116,3 +109,58 @@ RewriteRule ^thankyou(.*) https://donate.torproject.org/thank-you [R=302,L] # some external resources (the donate infrastructure in particular) and # getting it changed there is apparently hard or something. RewriteRule ^donate-email(.*) https://donate.torproject.org/ [R=302,L] + +# Donation campaign +# 2020 +RewriteRule ^donate/donate-usetor-bp1(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-usetor-twitter-en(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-ann-usetor-tw(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-ann-usetor-tw-en(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-ann-usetor-fb(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-usetor-blog(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-hrd-usetor-tw(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-usetor-hp1(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-usetor-fb(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-usetor-md(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-usetor-tw(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-twitter(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-usertor-ld(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-usetor-ig(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-usetor-tn1(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-usetor-yt(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-usetor-em1(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-usetor-gp(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/en(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/ru(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/es(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-download(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-amazon(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-button(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-foot(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-options(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-button(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-usetor-en-US(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-usetor-ru(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-usetor-de(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-usetor-fr(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-usetor-zh-CN(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-usetor-es-ES(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-usetor-ja(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-usetor-it(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-usetor-pt-BR(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-usetor-tr(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-usetor-ar(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-usetor-pl(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-usetor-mobile-default(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-usetor-mobile-(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-tba-tb2/donate/donate-usetor-mobile-(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-usetor-mobile-ru(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-tba-tb4(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-tba-tb5(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-tba-tb6(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-tba-tb7(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-tba-tb8(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-tba-tb9(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-tba-tb10(.*) https://donate.torproject.org/ [R=302,L] diff --git a/.htaccess-membership b/.htaccess-membership deleted file mode 100644 index 64537967..00000000 --- a/.htaccess-membership +++ /dev/null @@ -1,4 +0,0 @@ -AuthType Basic - AuthName "Secure Content" - AuthUserFile .htpasswd - require valid-user

1 0

[tpo/staging] Edit htaccess
by hiro＠torproject.org 27 Sep '20

27 Sep '20

commit c56147f2115367c10d1d08e6e44f2c2c5ef49685 Author: hiro <hiro(a)torproject.org> Date: Sun Sep 27 19:16:01 2020 +0200 Edit htaccess --- .htaccess | 293 +++++++++++--------------------------------------------------- 1 file changed, 50 insertions(+), 243 deletions(-) diff --git a/.htaccess b/.htaccess index 1f35b8f7..9f26ed62 100644 --- a/.htaccess +++ b/.htaccess @@ -70,10 +70,6 @@ RewriteRule ^newsletter(.*) https://newsletter.torproject.org [R=302,L] # Press RewriteRule ^press/press(.*) /press [R=302,L] -# Donation campaign -# 2019 -RewriteRule ^donate(.*) https://donate.torproject.org [R=302,L] - # other (feel free to categorize) RewriteRule ^people(.*) /about/people$1 [R=302,L] RewriteRule ^about/contact(.*) /contact$1 [R=302,L] @@ -100,12 +96,9 @@ RewriteRule ^eff/(.*) https://2019.www.torproject.org/eff/$1 [R=302,L] # Videos RewriteRule ^videos/(.*) https://2019.www.torproject.org/videos/$1 [R=302,L] - # Donation campaign # 2017 # Special-case the donate-options and amazon page so it doesn't get redirected -RewriteRule ^donate/donate-options(.*) https://2019.www.torproject.org/donate/donate-options$1 [END] -RewriteRule ^donate/donate-amazon(.*) https://2019.www.torproject.org/donate/donate-amazon$1 [END] RewriteRule ^donate/donate(.*) https://donate.torproject.org [R=302,L] RewriteRule ^donate/donor-faq(.*) https://donate.torproject.org/donor-faq [R=302,L] RewriteRule ^donate/donor-privacy-policy(.*) https://donate.torproject.org/privacy-policy [R=302,L] @@ -121,239 +114,53 @@ RewriteRule ^donate-email(.*) https://donate.torproject.org/ [R=302,L] # 2020 RewriteRule ^donate/donate-usetor-bp1(.*) https://donate.torproject.org/ [R=302,L] RewriteRule ^donate/donate-usetor-twitter-en(.*) https://donate.torproject.org/ [R=302,L] -Clicked on a tweet generated by the thank you page tweet intent button -donate.torproject.org - - -/donate/donate-ann-usetor-tw -Twitter -donate.torproject.org - - -/donate/donate-ann-usetor-tw-en -Twitter announcement -donate.torproject.org - - -/donate/donate-ann-usetor-fb -Facebook announcement -donate.torproject.org - - -/donate/donate-usetor-blog -generic blog post -donate.torproject.org - - -/donate/donate-hrd-usetor-tw -blog post HR Day twitter -donate.torproject.org - - -/donate/donate-usetor-hp1 -torproject.org homepage banner -donate.torproject.org - - -https://torproject.org/donate/donate-usetor-fb -Facebook posts -donate.torproject.org - - -https://torproject.org/donate/donate-usetor-md -Mastodon posts -donate.torproject.org - - -https://torproject.org/donate/donate-usetor-tw -Twitter posts -donate.torproject.org - - -/donate/donate-twitter -Twitter -donate.torproject.org - - -https://torproject.org/donate/donate-usertor-ld -LinkedIn posts -donate.torproject.org - - -https://torproject.org/donate/donate-usetor-ig -Instagram posts -donate.torproject.org - - -/donate/donate-usetor-tn1 -Tor Newsletter -donate.torproject.org - - -/donate/donate-usetor-yt -YouTube posts -donate.torproject.org - - -/donate/donate-usetor-em1 -Announcement email -donate.torproject.org - - -/donate/donate-usetor-gp -Google Play -donate.torproject.org - -/donate/en -En locale -donate.torproject.org - - -/donate/ru -Ru locale -donate.torproject.org - - -/donate/es -Es locale -donate.torproject.org/es - - -/donate/donate.html -- -donate.torproject.org - - -/donate/donate-download.html.en -- -donate.torproject.org - - -/donate/donate.html.en -- -donate.torproject.org - - -/donate/donate-amazon.html.en -- -donate.torproject.org - - -/donate/donate-button.html.en -- -donate.torproject.org - - -/donate/donate-foot.html.en -- -donate.torproject.org - - -/donate/donate-options.html.en -- -donate.torproject.org - - -/donate/donate-download.html -- -donate.torproject.org - - -/donate/ -- -donate.torproject.org - - -/donate/donate-button.html -- -donate.torproject.org - -/donate/donate-usetor-en-US -about:tor donate button (english) (TBB) - - -/donate/donate-usetor-ru -about:tor donate button (Russian) (TBB) - - -/donate/donate-usetor-de -about:tor donate button (German) (TBB) - - -/donate/donate-usetor-fr -about:tor donate button (French) (TBB) - - -/donate/donate-usetor-zh-CN -about:tor donate button (Cantonese) (TBB) - - -/donate/donate-usetor-es-ES -about:tor donate button (Spanish) (TBB) - - -/donate/donate-usetor-ja -about:tor donate button (Japanese) (TBB) - - -/donate/donate-usetor-it -about:tor donate button (Italian) (TBB) - - -/donate/donate-usetor-pt-BR -about:tor donate button (Portuguese) (TBB) - - -/donate/donate-usetor-tr -about:tor donate button (Turkish) (TBB) - - -/donate/donate-usetor-ar -about:tor donate button (Arabic) (TBB) - - -/donate/donate-usetor-pl -about:tor donate button (Polish) (TBB) - - -/donate/donate-usetor-mobile-default -about:tor donate button (english) (TBA) - - -/donate/donate-usetor-mobile- -- - - -/donate/donate-tba-tb2/donate/donate-usetor-mobile- -about:tor donate button (language2) (TBA) - - -/donate/donate-usetor-mobile-ru -about:tor donate button (language3) (TBA) - - -/donate/donate-tba-tb4 -about:tor donate button (language4) (TBA) - - -/donate/donate-tba-tb5 -about:tor donate button (language5) (TBA) - - -/donate/donate-tba-tb6 -about:tor donate button (language6) (TBA) - - -/donate/donate-tba-tb7 -about:tor donate button (language7) (TBA) - - -/donate/donate-tba-tb8 -about:tor donate button (language8) (TBA) - - -/donate/donate-tba-tb9 -about:tor donate button (language10) (TBA) - - -/donate/donate-tba-tb10 +RewriteRule ^donate/donate-ann-usetor-tw(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-ann-usetor-tw-en(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-ann-usetor-fb(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-usetor-blog(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-hrd-usetor-tw(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-usetor-hp1(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-usetor-fb(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-usetor-md(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-usetor-tw(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-twitter(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-usertor-ld(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-usetor-ig(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-usetor-tn1(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-usetor-yt(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-usetor-em1(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-usetor-gp(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/en(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/ru(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/es(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-download(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-amazon(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-button(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-foot(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-options(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-button(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-usetor-en-US(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-usetor-ru(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-usetor-de(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-usetor-fr(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-usetor-zh-CN(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-usetor-es-ES(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-usetor-ja(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-usetor-it(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-usetor-pt-BR(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-usetor-tr(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-usetor-ar(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-usetor-pl(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-usetor-mobile-default(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-usetor-mobile-(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-tba-tb2/donate/donate-usetor-mobile-(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-usetor-mobile-ru(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-tba-tb4(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-tba-tb5(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-tba-tb6(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-tba-tb7(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-tba-tb8(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-tba-tb9(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-tba-tb10(.*) https://donate.torproject.org/ [R=302,L]

1 0