[tor-commits] [translation/abouttor-homepage] https://gitweb.torproject.org/translation.git/commit/?h=abouttor-homepage
commit 33891498a3d3744cb1bb1624c7c6177444bd8175 Author: Translation commit bot Date: Thu Oct 15 01:15:02 2020 + https://gitweb.torproject.org/translation.git/commit/?h=abouttor-homepage --- mk/aboutTor.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mk/aboutTor.dtd b/mk/aboutTor.dtd index 67a47e79ba..0ff2075f43 100644 --- a/mk/aboutTor.dtd +++ b/mk/aboutTor.dtd @@ -32,4 +32,4 @@ - + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/abouttor-homepage_completed] https://gitweb.torproject.org/translation.git/commit/?h=abouttor-homepage_completed
commit a3057f36ce96ae7039b56bf4eb03957da1387a84 Author: Translation commit bot Date: Thu Oct 15 01:15:04 2020 + https://gitweb.torproject.org/translation.git/commit/?h=abouttor-homepage_completed --- mk/aboutTor.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mk/aboutTor.dtd b/mk/aboutTor.dtd index 67a47e79ba..0ff2075f43 100644 --- a/mk/aboutTor.dtd +++ b/mk/aboutTor.dtd @@ -32,4 +32,4 @@ - + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/abouttor-homepage] https://gitweb.torproject.org/translation.git/commit/?h=abouttor-homepage
commit 47dadf83b1385c592b069f568627f9601af5d2c2 Author: Translation commit bot Date: Wed Oct 14 23:45:02 2020 + https://gitweb.torproject.org/translation.git/commit/?h=abouttor-homepage --- nl/aboutTor.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nl/aboutTor.dtd b/nl/aboutTor.dtd index 252902a914..738de6bd54 100644 --- a/nl/aboutTor.dtd +++ b/nl/aboutTor.dtd @@ -32,4 +32,4 @@ - + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [newsletter/master] Added page for civicrm mailing errors
commit 38291da85335a771de078dfd0a19b125ae3568b0 Author: Peter Haight Date: Mon Sep 28 16:32:06 2020 -0700 Added page for civicrm mailing errors If a user clicks on a link like an optout or unsubscribe link in a CiviCRM mailing and then there's some issue with the unsubscribe, we need to show them some errors, so we need to send them back to the lektor site because we aren't going to have any display pages on the donate site once the Lektor pages go live. Issue #48285 --- content/civicrm-mailing-error/contents.lr | 5 + 1 file changed, 5 insertions(+) diff --git a/content/civicrm-mailing-error/contents.lr b/content/civicrm-mailing-error/contents.lr new file mode 100644 index 000..fdd1aff --- /dev/null +++ b/content/civicrm-mailing-error/contents.lr @@ -0,0 +1,5 @@ +_model: page +--- +title: Error +--- +_template: page-no-sidebar.html ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [newsletter/master] Added page for subscription confirmation errors
commit 37acf0ce3334bb5c9d050565cb67d70f8d7da0b8 Author: Peter Haight Date: Tue Sep 22 15:52:24 2020 -0700 Added page for subscription confirmation errors Once we finish all of the Lektor work for the donate site, we don't want to have any display pages on the donate site any more, so the error pages need to be moved here. Issue #48283 --- content/subscription-error/contents.lr | 7 +++ lego | 2 +- templates/errors.html | 28 3 files changed, 36 insertions(+), 1 deletion(-) diff --git a/content/subscription-error/contents.lr b/content/subscription-error/contents.lr new file mode 100644 index 000..ac648bb --- /dev/null +++ b/content/subscription-error/contents.lr @@ -0,0 +1,7 @@ +_model: page +--- +title: Error Confirming Your Subscription +--- +html: errors.html +--- +_template: errors.html diff --git a/lego b/lego index 925c4c1..de11708 16 --- a/lego +++ b/lego @@ -1 +1 @@ -Subproject commit 925c4c1761ca69c4367f79b15ed9a2bc19a19a33 +Subproject commit de117085d3e2f48f1f5878b5f1d6951a07662d5c diff --git a/templates/errors.html b/templates/errors.html new file mode 100644 index 000..ebc1a5b --- /dev/null +++ b/templates/errors.html @@ -0,0 +1,28 @@ +{% from "macros/archive.html" import render_intro_post %} + + + + + +{% block title %}{{ this.title }}{% endblock %} + + +{% include 'navbar.html' %} + + + + + + {{ this.title }} + + + {% block body %}{% endblock %} + + + + + + +{% include 'footer.html' %} + + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [newsletter/master] Updated subscription form to use live URL
commit 55d3fdefa650cb2341cdcde44f0d6bd343009a13 Author: Peter Haight Date: Fri Oct 2 10:24:54 2020 -0700 Updated subscription form to use live URL I want to have this set to the live URL so we don't have to change it for launch. For testing people will just have to edit it manually in their local repositories for now. --- templates/intro.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/intro.html b/templates/intro.html index 7846fd3..0d0cbb1 100644 --- a/templates/intro.html +++ b/templates/intro.html @@ -30,7 +30,7 @@ - https://tor-donate.local/subscription-request; method="POST" class="form-wide"> + https://donate.torproject.org/subscription-request; method="POST" class="form-wide"> ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [newsletter/master] Updated to URL we'll use for launch
commit 3e9005c8f9b33f5e1c96fae6fbaf57641ac799d3 Author: Peter Haight Date: Fri Oct 9 14:57:32 2020 -0700 Updated to URL we'll use for launch I think we're going to use donate-api.torproject.org for launch so I'm updating the form URL to that. --- templates/intro.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/intro.html b/templates/intro.html index 0d0cbb1..00ce413 100644 --- a/templates/intro.html +++ b/templates/intro.html @@ -30,7 +30,7 @@ - https://donate.torproject.org/subscription-request; method="POST" class="form-wide"> + https://donate-api.torproject.org/subscription-request; method="POST" class="form-wide"> ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [newsletter/master] Merge giant-rabbit contributions for the new donate portal'
commit 5351f5051180178a31a8a72084ab94ff9a976012 Merge: 6a23a81 0e51868 Author: hiro Date: Wed Oct 14 17:36:01 2020 +0200 Merge giant-rabbit contributions for the new donate portal' content/civicrm-mailing-error/contents.lr | 5 + content/subscription-confirmed/contents.lr| 15 ++ content/subscription-error/contents.lr| 7 +++ content/subscription-request-sent/contents.lr | 11 +++ lego | 2 +- templates/intro.html | 22 ++--- templates/newsletter.html | 1 + templates/page-no-sidebar.html| 28 +++ 8 files changed, 87 insertions(+), 4 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [newsletter/master] Added subscription-confirmed and request-sent
commit 30aff5d425dc675a3abc8c9f63d0c9d3f63fce4a Author: Peter Haight Date: Tue Sep 22 16:34:33 2020 -0700 Added subscription-confirmed and request-sent With moving all of the display pages that exist on the donate site, we need these sebuscription request sent and subscription confirmed pages. Issue #48283 --- content/subscription-confirmed/contents.lr | 15 +++ content/subscription-error/contents.lr | 2 +- content/subscription-request-sent/contents.lr | 11 +++ lego| 2 +- templates/{errors.html => page-no-sidebar.html} | 2 +- 5 files changed, 29 insertions(+), 3 deletions(-) diff --git a/content/subscription-confirmed/contents.lr b/content/subscription-confirmed/contents.lr new file mode 100644 index 000..afae0d3 --- /dev/null +++ b/content/subscription-confirmed/contents.lr @@ -0,0 +1,15 @@ +_model: page +--- +title: Subscription Confirmed +--- +html: errors.html +--- +_template: page-no-sidebar.html +--- +body: + +Thanks for joining our email list - you'll hear from us soon! In the meantime, follow @TorProject on Twitter to keep in touch. + +As a non-profit organization, we rely on contributions from people like you to help us create and maintain technology used by millions of users daily to browse, communicate, and express themselves online privately. Every little bit helps - please donate today. + +https://www.torproject.org/donate;>Donate Now diff --git a/content/subscription-error/contents.lr b/content/subscription-error/contents.lr index ac648bb..33bd71c 100644 --- a/content/subscription-error/contents.lr +++ b/content/subscription-error/contents.lr @@ -4,4 +4,4 @@ title: Error Confirming Your Subscription --- html: errors.html --- -_template: errors.html +_template: page-no-sidebar.html diff --git a/content/subscription-request-sent/contents.lr b/content/subscription-request-sent/contents.lr new file mode 100644 index 000..f9393bf --- /dev/null +++ b/content/subscription-request-sent/contents.lr @@ -0,0 +1,11 @@ +_model: page +--- +title: Confirmation Sent +--- +html: errors.html +--- +_template: page-no-sidebar.html +--- +body: + + A request for confirmation has been sent to your email address. Once you click on that link, you will be subscribed. diff --git a/lego b/lego index de11708..34e2d07 16 --- a/lego +++ b/lego @@ -1 +1 @@ -Subproject commit de117085d3e2f48f1f5878b5f1d6951a07662d5c +Subproject commit 34e2d07774123f707c707ce186423a96bf036299 diff --git a/templates/errors.html b/templates/page-no-sidebar.html similarity index 94% rename from templates/errors.html rename to templates/page-no-sidebar.html index ebc1a5b..d6c9fe2 100644 --- a/templates/errors.html +++ b/templates/page-no-sidebar.html @@ -16,7 +16,7 @@ {{ this.title }} - {% block body %}{% endblock %} + {% block body %}{{ this.body }}{% endblock %} ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [newsletter/master] Added captcha and error handling to newsletter form
commit 8fb60a284a9e96b3fcec9972cadfae458d37b912 Author: Peter Haight Date: Tue Sep 22 15:10:36 2020 -0700 Added captcha and error handling to newsletter form There are some errors that can happen when submitting the subscription request and we don't want to have any styled pages on the donate site once we finish moving the donate pages to lektor, so we need to have the donate site redirect with error messages back to the original page, then use Javascript to get the errors displayed. Issue #48283 --- lego | 2 +- templates/intro.html | 22 +++--- templates/newsletter.html | 1 + 3 files changed, 21 insertions(+), 4 deletions(-) diff --git a/lego b/lego index 7f2289b..925c4c1 16 --- a/lego +++ b/lego @@ -1 +1 @@ -Subproject commit 7f2289bf68685da40878bb09ee91346057c443d3 +Subproject commit 925c4c1761ca69c4367f79b15ed9a2bc19a19a33 diff --git a/templates/intro.html b/templates/intro.html index 35b2726..7846fd3 100644 --- a/templates/intro.html +++ b/templates/intro.html @@ -30,16 +30,32 @@ - https://donate.torproject.org/subscription-request; method="POST" class="form-wide"> + https://tor-donate.local/subscription-request; method="POST" class="form-wide"> + - + + + + + - + + + + +https://tor-donate.local/captcha; border="0" /> + + + + + + + {% endblock %} diff --git a/templates/newsletter.html b/templates/newsletter.html index 8772ec3..7ab7c33 100644 --- a/templates/newsletter.html +++ b/templates/newsletter.html @@ -2,6 +2,7 @@ + {% block title %}{{ this.title }}{% endblock %} ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [newsletter/master] Switch back to official repository
commit 0e51868a0a8cb71fce430128787864f2d78d7cdc Author: Peter Haight Date: Tue Oct 13 11:15:19 2020 -0700 Switch back to official repository We were using the GR repository for this because we didn't want to update the official repository until we were ready to merge. --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 96cf970..d246c46 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "lego"] path = lego - url = ssh://g...@git.giantrabbit.com/tor/lego.git + url = https://git.torproject.org/project/web/lego.git ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [newsletter/master] Switched GRs lego repository
commit 3305714a76b04e7e3cf556f1b3a1d11879103e4a Author: Peter Haight Date: Tue Sep 22 16:43:31 2020 -0700 Switched GRs lego repository We'll need to switch this back when we merge back into Tor's repositories. --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index d246c46..96cf970 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "lego"] path = lego - url = https://git.torproject.org/project/web/lego.git + url = ssh://g...@git.giantrabbit.com/tor/lego.git ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [lego/master] Move donate lektor packages to be local
commit 4903d4baa8b01b870b0af8be217012c19d57e644 Author: Peter Haight Date: Tue Oct 13 11:06:16 2020 -0700 Move donate lektor packages to be local Adding the packages the new donate stuff is using to the repository so that they do not need to be downloaded to run lektor. I had to make some modifications to the setup.py files for these modules in order to get them to work. Otherwise I was getting errors about invalid syntax in the requires.txt files and also one of the modules was requiring lektor which was pulling in a bunch of stuff that's not needed because we are running inside lektor. I put all these changes in patch files in a new patches subdirectory. --- packages/environs/CHANGELOG.md | 259 packages/environs/CONTRIBUTING.md | 31 ++ packages/environs/LICENSE | 19 + packages/environs/MANIFEST.in | 2 + packages/environs/PKG-INFO | 458 + packages/environs/README.md| 430 +++ packages/environs/environs.egg-info/PKG-INFO | 454 packages/environs/environs.egg-info/SOURCES.txt| 16 + .../environs.egg-info/dependency_links.txt | 1 + packages/environs/environs.egg-info/not-zip-safe | 1 + packages/environs/environs.egg-info/requires.txt | 2 + packages/environs/environs.egg-info/top_level.txt | 1 + packages/environs/environs/__init__.py | 393 ++ packages/environs/environs/py.typed| 1 + packages/environs/pyproject.toml | 3 + packages/environs/setup.cfg| 19 + packages/environs/setup.py | 66 +++ packages/envvars/LICENSE | 22 + packages/envvars/MANIFEST.in | 2 + packages/envvars/PKG-INFO | 106 + packages/envvars/README.rst| 92 + packages/envvars/lektor_envvars.egg-info/PKG-INFO | 106 + .../envvars/lektor_envvars.egg-info/SOURCES.txt| 11 + .../lektor_envvars.egg-info/dependency_links.txt | 1 + .../lektor_envvars.egg-info/entry_points.txt | 3 + .../envvars/lektor_envvars.egg-info/top_level.txt | 1 + packages/envvars/lektor_envvars.py | 34 ++ packages/envvars/setup.cfg | 15 + packages/envvars/setup.py | 21 + packages/npm-support/CHANGELOG.md | 17 + packages/npm-support/LICENSE.md| 32 ++ packages/npm-support/MANIFEST.in | 1 + packages/npm-support/PKG-INFO | 132 ++ packages/npm-support/README.md | 120 ++ .../lektor_npm_support.egg-info/PKG-INFO | 131 ++ .../lektor_npm_support.egg-info/SOURCES.txt| 12 + .../dependency_links.txt | 1 + .../lektor_npm_support.egg-info/entry_points.txt | 3 + .../lektor_npm_support.egg-info/top_level.txt | 1 + packages/npm-support/lektor_npm_support.py | 143 +++ packages/npm-support/setup.cfg | 10 + packages/npm-support/setup.py | 34 ++ packages/patches/environs.patch| 11 + packages/patches/envvars.patch | 22 + packages/patches/npm-support.patch | 14 + 45 files changed, 3254 insertions(+) diff --git a/packages/environs/CHANGELOG.md b/packages/environs/CHANGELOG.md new file mode 100644 index 000..ecacb75 --- /dev/null +++ b/packages/environs/CHANGELOG.md @@ -0,0 +1,259 @@ +# Changelog + +## 8.0.0 (2020-05-27) + +Bug fixes: + +- Fix behavior of recurse=True when custom filepath is passed to `env.read_env` + ([#100](https://github.com/sloria/environs/issues/100)). Thanks [ribeaud](https://github.com/ribeaud) and [timoklimmer](https://github.com/sloria/environs/pull/157) for the help. + +Other changes: + +- _Backwards-incompatible_: As a result of the above fix, passing a directory to `env.read_env` is no longer allowed and will raise a `ValueError`. + Only file paths or file names should be passed. + +## 7.4.0 (2020-04-18) + +- Add `subcast_key` argument to `env.dict` ([#151](https://github.com/sloria/environs/issues/151)). + Thanks [AugPro](https://github.com/AugPro) for the suggestion and PR. + +## 7.3.1 (2020-03-22) + +- Fix error when parsing empty list with subcast + [#137](https://github.com/sloria/environs/issues/137). + Thanks [sabdouni] for the catch and patch. + +## 7.3.0 (2020-03-01) + +- `log_level` accepts lower-cased log level names and rejects invalid + names ([#138](https://github.com/sloria/environs/pull/138)). + Thanks [gnarvaja](https://github.com/gnarvaja) for the PR. + +## 7.2.0 (2020-02-09) + +- Add `dj_cache_url` for caching Django cache URLs
[tor-commits] [lego/master] Merge contribution from giant-rabbit for the donate portal
commit 95b15ac34e611a72c654ed1df607336f6f990cd6 Merge: c55b864 600dcb3 Author: hiro Date: Wed Oct 14 17:28:23 2020 +0200 Merge contribution from giant-rabbit for the donate portal .gitignore | 2 + packages/environs/CHANGELOG.md | 259 packages/environs/CONTRIBUTING.md | 31 ++ packages/environs/LICENSE | 19 + packages/environs/MANIFEST.in | 2 + packages/environs/PKG-INFO | 458 + packages/environs/README.md| 430 +++ packages/environs/environs.egg-info/PKG-INFO | 454 packages/environs/environs.egg-info/SOURCES.txt| 16 + .../environs.egg-info/dependency_links.txt | 1 + packages/environs/environs.egg-info/not-zip-safe | 1 + packages/environs/environs.egg-info/requires.txt | 2 + packages/environs/environs.egg-info/top_level.txt | 1 + packages/environs/environs/__init__.py | 393 ++ packages/environs/environs/py.typed| 1 + packages/environs/pyproject.toml | 3 + packages/environs/setup.cfg| 19 + packages/environs/setup.py | 66 +++ packages/envvars/LICENSE | 22 + packages/envvars/MANIFEST.in | 2 + packages/envvars/PKG-INFO | 106 + packages/envvars/README.rst| 92 + packages/envvars/lektor_envvars.egg-info/PKG-INFO | 106 + .../envvars/lektor_envvars.egg-info/SOURCES.txt| 11 + .../lektor_envvars.egg-info/dependency_links.txt | 1 + .../lektor_envvars.egg-info/entry_points.txt | 3 + .../envvars/lektor_envvars.egg-info/top_level.txt | 1 + packages/envvars/lektor_envvars.py | 34 ++ packages/envvars/setup.cfg | 15 + packages/envvars/setup.py | 21 + packages/npm-support/CHANGELOG.md | 17 + packages/npm-support/LICENSE.md| 32 ++ packages/npm-support/MANIFEST.in | 1 + packages/npm-support/PKG-INFO | 132 ++ packages/npm-support/README.md | 120 ++ .../lektor_npm_support.egg-info/PKG-INFO | 131 ++ .../lektor_npm_support.egg-info/SOURCES.txt| 12 + .../dependency_links.txt | 1 + .../lektor_npm_support.egg-info/entry_points.txt | 3 + .../lektor_npm_support.egg-info/top_level.txt | 1 + packages/npm-support/lektor_npm_support.py | 143 +++ packages/npm-support/setup.cfg | 10 + packages/npm-support/setup.py | 34 ++ packages/patches/environs.patch| 11 + packages/patches/envvars.patch | 22 + packages/patches/npm-support.patch | 14 + 46 files changed, 3256 insertions(+) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [lego/master] Ignore built egg packages
commit 600dcb3e259b56108a371bdda7871ac52e90ff6c Author: Peter Haight Date: Tue Oct 13 11:12:29 2020 -0700 Ignore built egg packages When lektor runs it builds these directories which we don't need to keep in the repository. --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index b66ae3a..5e27401 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,5 @@ __pycache__ *.pyc .egg* +/packages/txt-to-html/lektor_txt_to_html.egg-info/ +/packages/xml-to-html/lektor_xml_to_html.egg-info/ ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tpo/staging] Bump lego
commit 4cdd05c9d83017243e89812c42fc8eb9286435b4 Author: hiro Date: Wed Oct 14 16:16:56 2020 +0200 Bump lego --- lego | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lego b/lego index 517ce10e..c55b8645 16 --- a/lego +++ b/lego @@ -1 +1 @@ -Subproject commit 517ce10e07be156b02aae38c969feffb5607b02e +Subproject commit c55b86456c19f5f652b1ed24026009e327713254 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [lego/master] Add mobile tweaks
commit c55b86456c19f5f652b1ed24026009e327713254 Author: hiro Date: Wed Oct 14 16:16:39 2020 +0200 Add mobile tweaks --- templates/banner.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/banner.html b/templates/banner.html index ef6ff21..c7a3514 100644 --- a/templates/banner.html +++ b/templates/banner.html @@ -6,7 +6,7 @@ - + {{ _('Use a Mask, Use Tor.') }} ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tpo/staging] Bump lego
commit 719c28a187716ef221d691bca4beb583f6b195d9 Author: hiro Date: Wed Oct 14 16:15:01 2020 +0200 Bump lego --- lego | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lego b/lego index 8ff89667..517ce10e 16 --- a/lego +++ b/lego @@ -1 +1 @@ -Subproject commit 8ff896673797bf349814795ef0c0408982988f43 +Subproject commit 517ce10e07be156b02aae38c969feffb5607b02e ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'tor-gitlab/mr/170'
commit bb249a221f35fe3cef53df4c36c84c2d5e63b66d Merge: f02f8f8946 a251cff0c3 Author: David Goulet Date: Wed Oct 14 09:46:44 2020 -0400 Merge branch 'tor-gitlab/mr/170' changes/ticket40139| 7 ++ doc/man/tor.1.txt | 9 src/app/config/config.c| 2 +- src/app/config/or_options_st.h | 4 src/core/or/circuitbuild.c | 20 - src/core/or/circuituse.c | 25 -- src/test/conf_examples/large_1/expected| 1 - src/test/conf_examples/large_1/expected_no_dirauth | 1 - 8 files changed, 16 insertions(+), 53 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Make OptimisticData always-on.
commit 42a5e652cb9dc9818abd63d93fd51e908f2c56a4 Author: Nick Mathewson Date: Tue Oct 13 14:37:40 2020 -0400 Make OptimisticData always-on. We've been using it for years, and it seems to work just fine. This patch removes the option and its network parameter. Part of #40139 --- doc/man/tor.1.txt | 9 src/app/config/config.c| 2 +- src/app/config/or_options_st.h | 4 src/core/or/circuituse.c | 25 -- src/test/conf_examples/large_1/expected| 1 - src/test/conf_examples/large_1/expected_no_dirauth | 1 - 6 files changed, 5 insertions(+), 37 deletions(-) diff --git a/doc/man/tor.1.txt b/doc/man/tor.1.txt index cd53d5ea26..0e54fe9e0f 100644 --- a/doc/man/tor.1.txt +++ b/doc/man/tor.1.txt @@ -1314,15 +1314,6 @@ The following options are useful only for clients (that is, if Every NUM seconds consider whether to build a new circuit. (Default: 30 seconds) -[[OptimisticData]] **OptimisticData** **0**|**1**|**auto**:: -When this option is set, and Tor is using an exit node that supports -the feature, it will try optimistically to send data to the exit node -without waiting for the exit node to report whether the connection -succeeded. This can save a round-trip time for protocols like HTTP -where the client talks first. If OptimisticData is set to **auto**, -Tor will look at the UseOptimisticData parameter in the networkstatus. -(Default: auto) - // These are out of order because they logically belong together [[PathBiasCircThreshold]] **PathBiasCircThreshold** __NUM__ + diff --git a/src/app/config/config.c b/src/app/config/config.c index 0706a0dbdc..9625ed77fb 100644 --- a/src/app/config/config.c +++ b/src/app/config/config.c @@ -610,7 +610,7 @@ static const config_var_t option_vars_[] = { V(TestingAuthKeySlop, INTERVAL, "3 hours"), V(TestingSigningKeySlop, INTERVAL, "1 day"), - V(OptimisticData, AUTOBOOL, "auto"), + OBSOLETE("OptimisticData"), OBSOLETE("PortForwarding"), OBSOLETE("PortForwardingHelper"), OBSOLETE("PreferTunneledDirConns"), diff --git a/src/app/config/or_options_st.h b/src/app/config/or_options_st.h index 7f201b8dd7..6a5d408c54 100644 --- a/src/app/config/or_options_st.h +++ b/src/app/config/or_options_st.h @@ -869,10 +869,6 @@ struct or_options_t { * once. */ int MaxClientCircuitsPending; - /** If 1, we always send optimistic data when it's supported. If 0, we - * never use it. If -1, we do what the consensus says. */ - int OptimisticData; - /** If 1, we accept and launch no external network connections, except on * control ports. */ int DisableNetwork; diff --git a/src/core/or/circuituse.c b/src/core/or/circuituse.c index df23c63cff..9b506e67a1 100644 --- a/src/core/or/circuituse.c +++ b/src/core/or/circuituse.c @@ -2632,22 +2632,6 @@ cpath_is_on_circuit(origin_circuit_t *circ, crypt_path_t *crypt_path) return 0; } -/** Return true iff client-side optimistic data is supported. */ -static int -optimistic_data_enabled(void) -{ - const or_options_t *options = get_options(); - if (options->OptimisticData < 0) { -/* Note: this default was 0 before #18815 was merged. We can't take the - * parameter out of the consensus until versions before that are all - * obsolete. */ -const int32_t enabled = - networkstatus_get_param(NULL, "UseOptimisticData", /*default*/ 1, 0, 1); -return (int)enabled; - } - return options->OptimisticData; -} - /** Attach the AP stream apconn to circ's linked list of * p_streams. Also set apconn's cpath_layer to cpath, or to the last * hop in circ's cpath if cpath is NULL. @@ -2700,11 +2684,10 @@ link_apconn_to_circ(entry_connection_t *apconn, origin_circuit_t *circ, exitnode = node_get_by_id(cpath->extend_info->identity_digest); /* See if we can use optimistic data on this circuit */ - if (optimistic_data_enabled() && - (circ->base_.purpose == CIRCUIT_PURPOSE_C_GENERAL || - circ->base_.purpose == CIRCUIT_PURPOSE_C_HSDIR_GET || - circ->base_.purpose == CIRCUIT_PURPOSE_S_HSDIR_POST || - circ->base_.purpose == CIRCUIT_PURPOSE_C_REND_JOINED)) + if (circ->base_.purpose == CIRCUIT_PURPOSE_C_GENERAL || + circ->base_.purpose == CIRCUIT_PURPOSE_C_HSDIR_GET || + circ->base_.purpose == CIRCUIT_PURPOSE_S_HSDIR_POST || + circ->base_.purpose == CIRCUIT_PURPOSE_C_REND_JOINED) apconn->may_use_optimistic_data = 1; else apconn->may_use_optimistic_data = 0; diff --git a/src/test/conf_examples/large_1/expected b/src/test/conf_examples/large_1/expected index 99a12ffc84..7197993350 100644 --- a/src/test/conf_examples/large_1/expected +++ b/src/test/conf_examples/large_1/expected @@ -111,7 +111,6 @@ NumDirectoryGuards 4 NumEntryGuards 5 NumPrimaryGuards 8 OfflineMasterKey 1
[tor-commits] [tor/master] Make "usecreatefast" always-off.
commit ac311a38ec62e17868b484b8ace069d171c7506d Author: Nick Mathewson Date: Tue Oct 13 14:00:22 2020 -0400 Make "usecreatefast" always-off. Part of #40139, where I'm removing network parameters that we shouldn't be looking at any longer. --- src/core/or/circuitbuild.c | 20 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/src/core/or/circuitbuild.c b/src/core/or/circuitbuild.c index ab4ce9f784..3df0f9be8f 100644 --- a/src/core/or/circuitbuild.c +++ b/src/core/or/circuitbuild.c @@ -770,27 +770,15 @@ circuit_deliver_create_cell,(circuit_t *circ, return -1; } -/** Return true iff we should send a create_fast cell to start building a given - * circuit */ -static inline int +/** Return true iff we should send a create_fast cell to start building a + * given circuit */ +static inline bool should_use_create_fast_for_circuit(origin_circuit_t *circ) { - const or_options_t *options = get_options(); tor_assert(circ->cpath); tor_assert(circ->cpath->extend_info); - if (!circuit_has_usable_onion_key(circ)) { -/* We don't have ntor, and we don't have or can't use TAP, - * so our hand is forced: only a create_fast will work. */ -return 1; - } - if (public_server_mode(options)) { -/* We're a server, and we have a usable onion key. We can choose. - * Prefer to blend our circuit into the other circuits we are - * creating on behalf of others. */ -return 0; - } - return networkstatus_get_param(NULL, "usecreatefast", 0, 0, 1); + return ! circuit_has_usable_onion_key(circ); } /** ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tpo/staging] Bump lego
commit 10bb0fc8d30da088d9ccef162c1c215744bf2b87 Author: hiro Date: Wed Oct 14 15:47:47 2020 +0200 Bump lego --- lego | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lego b/lego index 7f2289bf..8ff89667 16 --- a/lego +++ b/lego @@ -1 +1 @@ -Subproject commit 7f2289bf68685da40878bb09ee91346057c443d3 +Subproject commit 8ff896673797bf349814795ef0c0408982988f43 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Add changes file for 40139 (removing usecreatefast and useoptimisticdata
commit a251cff0c3c9cb04422c1d93ad6ea2e804b50a1e Author: Nick Mathewson Date: Tue Oct 13 14:42:59 2020 -0400 Add changes file for 40139 (removing usecreatefast and useoptimisticdata --- changes/ticket40139 | 7 +++ 1 file changed, 7 insertions(+) diff --git a/changes/ticket40139 b/changes/ticket40139 new file mode 100644 index 00..fce29233ef --- /dev/null +++ b/changes/ticket40139 @@ -0,0 +1,7 @@ + o Removed features (network parameters): + - The "optimistic data" feature is now always on; there is no longer an + option to disable it from the torrc file or from the consensus + directory. + Closes part of 40139. + - The "usecreatefast" network parameter is now removed; there is no + longer an option for authorities to turn it off. Closes part of 40139. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Use "flavor" spelling consistently on manpage.
commit f02f8f8946bcfb0e11f9ce8c636845731cdddbeb Author: Nick Mathewson Date: Wed Oct 14 09:45:41 2020 -0400 Use "flavor" spelling consistently on manpage. --- doc/man/tor.1.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/man/tor.1.txt b/doc/man/tor.1.txt index 419c30ed4c..c885eb79c0 100644 --- a/doc/man/tor.1.txt +++ b/doc/man/tor.1.txt @@ -616,7 +616,7 @@ forward slash (/) in the configuration file and on the command line. **DirCache** fetches and serves all documents except extrainfo descriptors, **DownloadExtraInfo*** fetches extrainfo documents, and serves them if **DirCache** is on, and **UseMicrodescriptors** changes the -flavour of consensuses and descriptors that is fetched and used for +flavor of consensuses and descriptors that is fetched and used for building circuits. (Default: 0) [[HardwareAccel]] **HardwareAccel** **0**|**1**:: ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Apply typo fix patch from Samanta Navarro on #40161.
commit d66cec8520452a5434ec356f330b22b8015a1e78 Author: Nick Mathewson Date: Wed Oct 14 09:43:26 2020 -0400 Apply typo fix patch from Samanta Navarro on #40161. --- doc/man/tor.1.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/man/tor.1.txt b/doc/man/tor.1.txt index ac4582a92b..419c30ed4c 100644 --- a/doc/man/tor.1.txt +++ b/doc/man/tor.1.txt @@ -150,7 +150,7 @@ The following options in this section are only recognized on the + Use the **`--newpass`** option with **`--keygen`** only when you need to add, change, or remove a passphrase on an existing ed25519 -master identity key. You will be prompted for the old passphase +master identity key. You will be prompted for the old passphrase (if any), and the new passphrase (if any). + [NOTE] @@ -616,7 +616,7 @@ forward slash (/) in the configuration file and on the command line. **DirCache** fetches and serves all documents except extrainfo descriptors, **DownloadExtraInfo*** fetches extrainfo documents, and serves them if **DirCache** is on, and **UseMicrodescriptors** changes the -flavour of consensues and descriptors that is fetched and used for +flavour of consensuses and descriptors that is fetched and used for building circuits. (Default: 0) [[HardwareAccel]] **HardwareAccel** **0**|**1**:: @@ -1828,7 +1828,7 @@ The following options control when Tor enters and leaves dormant mode: this option only with great caution: it has the potential to create spurious traffic on the network. This option should only be used if Tor is started by an affirmative user activity (like -clicking on an applcation or running a command), and not if Tor +clicking on an application or running a command), and not if Tor is launched for some other reason (for example, by a startup process, or by an application that launches itself on every login.) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [lego/master] Update banner and eoy css
commit 9e154145ce6cb507819414457296a7c5cfe5c528 Author: hiro Date: Wed Oct 14 15:15:49 2020 +0200 Update banner and eoy css --- assets/scss/_eoy.scss | 2 +- assets/static/css/bootstrap.css | 2 +- assets/static/css/images/home/png/tape-purple.png | Bin 9194 -> 2612 bytes assets/static/css/images/home/png/tape.png| Bin 6539 -> 2711 bytes templates/banner.html | 10 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/assets/scss/_eoy.scss b/assets/scss/_eoy.scss index 03ec9cd..ee1baba 100644 --- a/assets/scss/_eoy.scss +++ b/assets/scss/_eoy.scss @@ -66,7 +66,7 @@ .rectangle { background-image: url('./images/home/png/tape.png'); color: black; - padding: 20px; + padding: 10px; font-size: 2em; font-family: "TerminalGrotesque", sans-serif; text-decoration: none; diff --git a/assets/static/css/bootstrap.css b/assets/static/css/bootstrap.css index 3298feb..9937846 100644 --- a/assets/static/css/bootstrap.css +++ b/assets/static/css/bootstrap.css @@ -8112,7 +8112,7 @@ a.side-nav.active { .rectangle { background-image: url("./images/home/png/tape.png"); color: black; - padding: 20px; + padding: 10px; font-size: 2em; font-family: "TerminalGrotesque", sans-serif; text-decoration: none; diff --git a/assets/static/css/images/home/png/tape-purple.png b/assets/static/css/images/home/png/tape-purple.png index 80621e9..567b7cb 100644 Binary files a/assets/static/css/images/home/png/tape-purple.png and b/assets/static/css/images/home/png/tape-purple.png differ diff --git a/assets/static/css/images/home/png/tape.png b/assets/static/css/images/home/png/tape.png index 9928930..ba36981 100644 Binary files a/assets/static/css/images/home/png/tape.png and b/assets/static/css/images/home/png/tape.png differ diff --git a/templates/banner.html b/templates/banner.html index 0eb65ca..ef6ff21 100644 --- a/templates/banner.html +++ b/templates/banner.html @@ -6,24 +6,24 @@ - + {{ _('Use a Mask, Use Tor.') }} {% if locale.direction == 'text-right' %} - + {% else %} - + {% endif %} {{ _('Resist the surveillance pandemic.') }} {% if locale.direction == 'text-right' %} - + {% else %} - + {% endif %} ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [lego/master] Fix assets path
commit da06e83d4413af648a440a28bc6f66d3251e1dfe Author: hiro Date: Wed Oct 14 13:57:22 2020 +0200 Fix assets path --- assets/scss/_eoy.scss | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/assets/scss/_eoy.scss b/assets/scss/_eoy.scss index b50b2d2..8e32585 100644 --- a/assets/scss/_eoy.scss +++ b/assets/scss/_eoy.scss @@ -3,12 +3,12 @@ font-style: normal; font-weight: 400; font-display: swap; - src: url('fonts/Kanit/kanit.woff2') format('woff2'); + src: url('./fonts/Kanit/kanit.woff2') format('woff2'); } @font-face { font-family: League Gothic; - src: url('fonts/LeagueGothic/LeagueGothic-Italic.otf'); + src: url('./fonts/LeagueGothic/LeagueGothic-Italic.otf'); font-style: italic; } @@ -87,7 +87,7 @@ top: 0; padding: 1.25rem 1.25rem 2rem; width: 100%; -background-image: url('../images/home/png/use-tor.png'); +background-image: url('./images/home/png/use-tor.png'); background-position: bottom 10% right 35%; background-repeat: no-repeat; background-size: contain; ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [lego/master] Create svg use-tor campaign image
commit c63cf16406c653d2b2a126a00446076e31a31bac Author: hiro Date: Tue Oct 13 22:18:59 2020 +0200 Create svg use-tor campaign image --- assets/static/css/images/home/svg/use-tor.svg | 1019 + 1 file changed, 1019 insertions(+) diff --git a/assets/static/css/images/home/svg/use-tor.svg b/assets/static/css/images/home/svg/use-tor.svg new file mode 100644 index 000..b0f9a27 --- /dev/null +++ b/assets/static/css/images/home/svg/use-tor.svg @@ -0,0 +1,1019 @@ + +http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd;> +http://www.w3.org/2000/svg; xmlns:xlink="http://www.w3.org/1999/xlink; x="0px" y="0px" width="434px" height="302px" viewBox="0 0 434 302" enable-background="new 0 0 434 302" xml:space="preserve"> + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [Git][tpo/applications/fenix][tor-browser-82.0.0b4-10.0-1] Bug 40071: Show only supported locales
Georg Koppen pushed to branch tor-browser-82.0.0b4-10.0-1 at The Tor Project / Applications / fenix Commits: 460d5891 by Matthew Finkel at 2020-10-13T14:05:35+00:00 Bug 40071: Show only supported locales - - - - - 1 changed file: - app/build.gradle Changes: = app/build.gradle = @@ -589,7 +589,7 @@ task buildTranslationArray { foundLocales.append("new String[]{") fileTree("src/main/res").visit { FileVisitDetails details -> -if(details.file.path.endsWith("/strings.xml")){ +if(details.file.path.endsWith("/torbrowser_strings.xml")){ def languageCode = details.file.parent.tokenize('/').last().replaceAll('values-','').replaceAll('-r','-') languageCode = (languageCode == "values") ? "en-US" : languageCode languageCodes.add(languageCode) View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/commit/460d5891f2788448088540e63f9f9c56958ece67 -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/commit/460d5891f2788448088540e63f9f9c56958ece67 You're receiving this email because of your account on gitlab.torproject.org. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/abouttor-homepage] https://gitweb.torproject.org/translation.git/commit/?h=abouttor-homepage
commit 8261727f362d53f9a040a78d399285b4f7e0791d Author: Translation commit bot Date: Wed Oct 14 09:45:03 2020 + https://gitweb.torproject.org/translation.git/commit/?h=abouttor-homepage --- nl/aboutTor.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nl/aboutTor.dtd b/nl/aboutTor.dtd index b191f724ff..252902a914 100644 --- a/nl/aboutTor.dtd +++ b/nl/aboutTor.dtd @@ -32,4 +32,4 @@ - + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-browser-build/master] Fold in 10.0.1 Changelog
commit f3369b53bfe2d34a617dc31b7a737af312383d38 Author: Georg Koppen Date: Wed Oct 14 07:08:05 2020 + Fold in 10.0.1 Changelog --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 19 +++ 1 file changed, 19 insertions(+) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index f36b366..953c3fd 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.0.1 -- October 13 2020 + * Windows + OS X + Linux + * Update NoScript to 11.1.1 + * Bump OpenSSL to 1.1.1h + * Update Tor Launcher to 0.2.26 + * Bug 31767: Avoid using intl.locale.requested preference directly + * Bug 40013: End of year 2020 Fundraising campaign [torbutton] + * Bug 40016: Fix onion pattern for LTR locales [torbutton] + * Bug 40139: Update Onboarding icon for 10.0 [tor-browser] + * Bug 40148: Disable Picture-in-Picture until we investigate and possibly fix it [tor-browser] + * Translations update + * Windows + * Bug 40140: Videos stop working with Tor Browser 10.0 on Windows + * Build System + * Windows + OS X + Linux + * Bump Go to 1.14.9 + * Windows + * Bug 40051: Remove SOURCE_DATE_EPOCH patch for OpenSSL + Tor Browser 10.0a8 -- October 8 2020 * Android * Update Fenix to 81.1.2 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits