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

[tpo/master] Fix "Steate" to "State of MA"
by emmapeel＠torproject.org 11 Sep '19

11 Sep '19

commit b04d1a69cb5b80bb3e0ed825500f694f1a4d5da8 Author: Gustavo Gus <gusgustavo(a)users.noreply.github.com> Date: Wed Sep 11 08:20:14 2019 +0000 Fix "Steate" to "State of MA" Fix second issue on #29945 --- content/about/reports/2012-form-pc/contents.lr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/about/reports/2012-form-pc/contents.lr b/content/about/reports/2012-form-pc/contents.lr index 7a4ac7b..4adebdc 100644 --- a/content/about/reports/2012-form-pc/contents.lr +++ b/content/about/reports/2012-form-pc/contents.lr @@ -6,7 +6,7 @@ date: 2012 --- tags: AUDIT --- -title: 2012 Steate of MA Form PC +title: 2012 State of MA Form PC --- _hidden: yes ---

1 0

[tpo/master] Fix typo "Steate" to "State of MA"
by emmapeel＠torproject.org 11 Sep '19

11 Sep '19

commit 0c73159f2762b2babded3572cf1125dd871cdd4d Merge: a6c4f52 b04d1a6 Author: emma peel <emma.peel(a)riseup.net> Date: Wed Sep 11 13:05:21 2019 +0200 Fix typo "Steate" to "State of MA" content/about/reports/2012-form-pc/contents.lr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor-browser-build/master] Bug 31596: Bump mingw-w64 version for fix for #31567
by boklm＠torproject.org 11 Sep '19

11 Sep '19

commit 3ea80a42a85edc5e931cd241218cc5f0f2ff5b57 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Sep 3 06:22:58 2019 +0000 Bug 31596: Bump mingw-w64 version for fix for #31567 --- projects/mingw-w64-clang/31567_1.patch | 33 -------------- projects/mingw-w64-clang/31567_2.patch | 82 ---------------------------------- projects/mingw-w64-clang/build | 3 +- projects/mingw-w64-clang/config | 4 +- projects/mingw-w64/config | 2 +- 5 files changed, 3 insertions(+), 121 deletions(-) diff --git a/projects/mingw-w64-clang/31567_1.patch b/projects/mingw-w64-clang/31567_1.patch deleted file mode 100644 index be316ee..0000000 --- a/projects/mingw-w64-clang/31567_1.patch +++ /dev/null @@ -1,33 +0,0 @@ -From d9c7a5aa3ac8d29b98f28af71d862c2d3931e7d8 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin(a)martin.st> -Date: Sun, 1 Sep 2019 06:05:40 +0000 -Subject: [PATCH 1/2] This function was moved from inline in header to a - statically linked one in 52a34d52d6f5f1789d329abd4e, where the use of this - define was dropped. -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -As this function is statically linked, the caller can't control -and change the behaviour of the function by defining -UCRTBASE_PRINTF_DEFAULT_WIDE in the calling translation unit, -but we should at least use the headers' default value (which currently -is zero). - -Signed-off-by: Martin Storsjö <martin(a)martin.st> - -diff --git a/mingw-w64-crt/stdio/ucrt__vsnwprintf.c b/mingw-w64-crt/stdio/ucrt__vsnwprintf.c -index bf9f4de2..c505c31e 100644 ---- a/mingw-w64-crt/stdio/ucrt__vsnwprintf.c -+++ b/mingw-w64-crt/stdio/ucrt__vsnwprintf.c -@@ -10,6 +10,6 @@ - - int __cdecl _vsnwprintf(wchar_t * __restrict__ _Dest,size_t _Count,const wchar_t * __restrict__ _Format,va_list _Args) __MINGW_ATTRIB_DEPRECATED_SEC_WARN - { -- return __stdio_common_vswprintf(UCRTBASE_PRINTF_LEGACY_VSPRINTF_NULL_TERMINATION, _Dest, _Count, _Format, NULL, _Args); -+ return __stdio_common_vswprintf(UCRTBASE_PRINTF_DEFAULT_WIDE | UCRTBASE_PRINTF_LEGACY_VSPRINTF_NULL_TERMINATION, _Dest, _Count, _Format, NULL, _Args); - } - int __cdecl (*__MINGW_IMP_SYMBOL(_vsnwprintf))(wchar_t *__restrict__, size_t, const wchar_t *__restrict__, va_list) = _vsnwprintf; --- -2.23.0.rc1 - diff --git a/projects/mingw-w64-clang/31567_2.patch b/projects/mingw-w64-clang/31567_2.patch deleted file mode 100644 index 12070aa..0000000 --- a/projects/mingw-w64-clang/31567_2.patch +++ /dev/null @@ -1,82 +0,0 @@ -From 44d0691f6fa51d2b3a0df911652c801635424e4e Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin(a)martin.st> -Date: Sun, 1 Sep 2019 06:08:24 +0000 -Subject: [PATCH 2/2] When __USE_MINGW_ANSI_STDIO is defined, we still call the - custom implementation bundled in libmingwex, which has the C99 standard - semantics for %s in wide format strings. -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This matches how the wide stdio functions behave both when using -msvcrt.dll, and in all versions of MSVC, even the modern ones that -use ucrt. - -Signed-off-by: Martin Storsjö <martin(a)martin.st> - -diff --git a/mingw-w64-headers/crt/conio.h b/mingw-w64-headers/crt/conio.h -index 363203c3..a92ee059 100644 ---- a/mingw-w64-headers/crt/conio.h -+++ b/mingw-w64-headers/crt/conio.h -@@ -21,12 +21,13 @@ - #define UCRTBASE_SCANF_LEGACY_WIDE_SPECIFIERS (0x0002) - #define UCRTBASE_SCANF_LEGACY_MSVCRT_COMPATIBILITY (0x0004) - --// Default wide printfs and scanfs to the standard mode -+// Default wide printfs and scanfs to the legacy wide mode. Only code built -+// with -D__USE_MINGW_ANSI_STDIO=1 will expect the standard behaviour. - #ifndef UCRTBASE_PRINTF_DEFAULT_WIDE --#define UCRTBASE_PRINTF_DEFAULT_WIDE 0 -+#define UCRTBASE_PRINTF_DEFAULT_WIDE UCRTBASE_PRINTF_LEGACY_WIDE_SPECIFIERS - #endif - #ifndef UCRTBASE_SCANF_DEFAULT_WIDE --#define UCRTBASE_SCANF_DEFAULT_WIDE 0 -+#define UCRTBASE_SCANF_DEFAULT_WIDE UCRTBASE_SCANF_LEGACY_WIDE_SPECIFIERS - #endif - #endif - -diff --git a/mingw-w64-headers/crt/stdio.h b/mingw-w64-headers/crt/stdio.h -index e183236d..e8d3c857 100644 ---- a/mingw-w64-headers/crt/stdio.h -+++ b/mingw-w64-headers/crt/stdio.h -@@ -147,12 +147,13 @@ extern FILE (* __MINGW_IMP_SYMBOL(_iob))[]; /* A pointer to an array of FILE */ - #define UCRTBASE_SCANF_LEGACY_WIDE_SPECIFIERS (0x0002) - #define UCRTBASE_SCANF_LEGACY_MSVCRT_COMPATIBILITY (0x0004) - --// Default wide printfs and scanfs to the standard mode -+// Default wide printfs and scanfs to the legacy wide mode. Only code built -+// with -D__USE_MINGW_ANSI_STDIO=1 will expect the standard behaviour. - #ifndef UCRTBASE_PRINTF_DEFAULT_WIDE --#define UCRTBASE_PRINTF_DEFAULT_WIDE 0 -+#define UCRTBASE_PRINTF_DEFAULT_WIDE UCRTBASE_PRINTF_LEGACY_WIDE_SPECIFIERS - #endif - #ifndef UCRTBASE_SCANF_DEFAULT_WIDE --#define UCRTBASE_SCANF_DEFAULT_WIDE 0 -+#define UCRTBASE_SCANF_DEFAULT_WIDE UCRTBASE_SCANF_LEGACY_WIDE_SPECIFIERS - #endif - #endif - -diff --git a/mingw-w64-headers/crt/wchar.h b/mingw-w64-headers/crt/wchar.h -index cd26e098..d1348bc2 100644 ---- a/mingw-w64-headers/crt/wchar.h -+++ b/mingw-w64-headers/crt/wchar.h -@@ -247,12 +247,13 @@ extern FILE (* __MINGW_IMP_SYMBOL(_iob))[]; /* A pointer to an array of FILE */ - #define UCRTBASE_SCANF_LEGACY_WIDE_SPECIFIERS (0x0002) - #define UCRTBASE_SCANF_LEGACY_MSVCRT_COMPATIBILITY (0x0004) - --// Default wide printfs and scanfs to the standard mode -+// Default wide printfs and scanfs to the legacy wide mode. Only code built -+// with -D__USE_MINGW_ANSI_STDIO=1 will expect the standard behaviour. - #ifndef UCRTBASE_PRINTF_DEFAULT_WIDE --#define UCRTBASE_PRINTF_DEFAULT_WIDE 0 -+#define UCRTBASE_PRINTF_DEFAULT_WIDE UCRTBASE_PRINTF_LEGACY_WIDE_SPECIFIERS - #endif - #ifndef UCRTBASE_SCANF_DEFAULT_WIDE --#define UCRTBASE_SCANF_DEFAULT_WIDE 0 -+#define UCRTBASE_SCANF_DEFAULT_WIDE UCRTBASE_SCANF_LEGACY_WIDE_SPECIFIERS - #endif - #endif - --- -2.23.0.rc1 - diff --git a/projects/mingw-w64-clang/build b/projects/mingw-w64-clang/build index 820346d..b4000f5 100644 --- a/projects/mingw-w64-clang/build +++ b/projects/mingw-w64-clang/build @@ -69,8 +69,7 @@ default_win32_winnt=0x601 cd $builddir/mingw-w64-clang patch -p1 < $rootdir/mingw-winrt.patch -patch -p1 < $rootdir/31567_1.patch -patch -p1 < $rootdir/31567_2.patch + cd mingw-w64-headers mkdir build && cd build ../configure --host=[% c("arch") %]-w64-mingw32 \ diff --git a/projects/mingw-w64-clang/config b/projects/mingw-w64-clang/config index 16adee8..a6b6cde 100644 --- a/projects/mingw-w64-clang/config +++ b/projects/mingw-w64-clang/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' git_url: https://git.code.sf.net/p/mingw-w64/mingw-w64 -git_hash: 2d52c4b3433e55b1c454f9567c0ae9adc4b83b41 +git_hash: 330025c54b85512d54b6960fad07498365c8fee3 version: '[% c("abbrev") %]' llvm_version: 8.0.0 gpg_keyring: clang.gpg @@ -36,5 +36,3 @@ input_files: - project: llvm-mingw name: llvm-mingw - filename: mingw-winrt.patch - - filename: 31567_1.patch - - filename: 31567_2.patch diff --git a/projects/mingw-w64/config b/projects/mingw-w64/config index 3bb1dda..0145194 100644 --- a/projects/mingw-w64/config +++ b/projects/mingw-w64/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' git_url: https://git.code.sf.net/p/mingw-w64/mingw-w64 -git_hash: 2d52c4b3433e55b1c454f9567c0ae9adc4b83b41 +git_hash: 330025c54b85512d54b6960fad07498365c8fee3 version: '[% c("abbrev") %]' var: container:

1 0

[tor-browser-build/master] Merge remote-tracking branch 'gk/bug_31596'
by boklm＠torproject.org 11 Sep '19

11 Sep '19

commit 4e92d40f4cee86426752aa21f7ddbb102be9d0c9 Merge: f08dbd5 3ea80a4 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Sep 11 13:02:09 2019 +0200 Merge remote-tracking branch 'gk/bug_31596' projects/mingw-w64-clang/31567_1.patch | 33 -------------- projects/mingw-w64-clang/31567_2.patch | 82 ---------------------------------- projects/mingw-w64-clang/build | 3 +- projects/mingw-w64-clang/config | 4 +- projects/mingw-w64/config | 2 +- 5 files changed, 3 insertions(+), 121 deletions(-)

1 0

[tor-browser/tor-browser-68.1.0esr-9.0-2] fixup! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 11 Sep '19

11 Sep '19

commit e489c5048b762b3226db23b6ea9ffc440617615e Author: Alex Catarineu <acat(a)torproject.org> Date: Mon Sep 9 17:49:40 2019 +0200 fixup! TB4: Tor Browser's Firefox preference overrides. Bug 31601: Disable recommended extensions again --- browser/app/profile/000-tor-browser.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 81352dcbaece..b2cecfdb1a82 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -273,8 +273,9 @@ pref("xpinstall.whitelist.add", ""); pref("xpinstall.whitelist.add.36", ""); // We don't know what extensions Mozilla is advertising to our users and we // don't want to have some random Google Analytics script running either on the -// about:addons page, see bug 22073 and 22900. +// about:addons page, see bug 22073, 22900 and 31601. pref("extensions.getAddons.showPane", false); +pref("extensions.htmlaboutaddons.recommendations.enabled", false); // Show our legacy extensions directly on about:addons and get rid of the // warning for the default theme. pref("extensions.legacy.exceptions", "{972ce4c6-7e08-4474-a285-3208198ce6fd},torbutton(a)torproject.org");

1 0

[tpo/master] Find and replace all links to "How to report bugs or feedback"
by emmapeel＠torproject.org 11 Sep '19

11 Sep '19

commit d83f7beb07eece2cbd221abd92dae295e7b15de8 Author: sabita <35147757+sabitarao(a)users.noreply.github.com> Date: Sat Sep 7 12:33:49 2019 +0530 Find and replace all links to "How to report bugs or feedback" Fixes part of https://dip.torproject.org/web/support/issues/39 --- content/download/alpha/contents.lr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/download/alpha/contents.lr b/content/download/alpha/contents.lr index 7f490e2..415cbef 100644 --- a/content/download/alpha/contents.lr +++ b/content/download/alpha/contents.lr @@ -13,4 +13,4 @@ title: Download Tor Browser Alpha body: Before we release a stable version of our software, we release an alpha version to test features and find bugs. -Please only download an alpha if you are okay with some things not working properly, want to help us find and [report bugs](https://trac.torproject.org/projects/tor/wiki/doc/community/HowToRepo…, and are not putting yourself at risk. +Please only download an alpha if you are okay with some things not working properly, want to help us find and [report bugs](https://support.torproject.org/misc/bug-or-feedback/), and are not putting yourself at risk.

1 0

[tpo/master] Replace link to "How to report bugs or feedback"
by emmapeel＠torproject.org 11 Sep '19

11 Sep '19

commit a6c4f524daf95ab11ed17e81551dc0ea2c98931e Merge: 83b23b6 d83f7be Author: emma peel <emma.peel(a)riseup.net> Date: Wed Sep 11 12:56:43 2019 +0200 Replace link to "How to report bugs or feedback" content/download/alpha/contents.lr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tpo/master] Replace link to "How to report bugs or feedback"
by emmapeel＠torproject.org 11 Sep '19

11 Sep '19

commit 83b23b6e9e43c7ef8308ea404dc790910319836a Merge: 003b828 0dc1c2c Author: emma peel <emma.peel(a)riseup.net> Date: Wed Sep 11 12:53:49 2019 +0200 Replace link to "How to report bugs or feedback" templates/macros/question.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tpo/master] Find and replace all links to "How to report bugs or feedback"
by emmapeel＠torproject.org 11 Sep '19

11 Sep '19

commit 0dc1c2c7aaf8c7a62f6112e087646509305c1339 Author: sabita <35147757+sabitarao(a)users.noreply.github.com> Date: Sat Sep 7 12:35:53 2019 +0530 Find and replace all links to "How to report bugs or feedback" Fixes part of https://dip.torproject.org/web/support/issues/39 --- templates/macros/question.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/macros/question.html b/templates/macros/question.html index 1b5fa59..4de15ac 100644 --- a/templates/macros/question.html +++ b/templates/macros/question.html @@ -12,7 +12,7 @@  <li class="list-group-item"> <a href="https://github.com/torproject/tpo/edit/master/content{{ item.path }}/contents.lr">{{ _("Edit this page") }}</a> - - <a href="https://trac.torproject.org/projects/tor/wiki/doc/community/HowToReportBugF…">{{ _("Suggest Feedback") }}</a> - + <a href="https://support.torproject.org/misc/bug-or-feedback/">{{ _("Suggest Feedback") }}</a> - <a href="#{{ item._id }}" data-target="#{{ item._id }}">{{ _("Permalink") }}</a> </li> </ul>

1 0

[tpo/master] Update trademark FAQ link in footer
by emmapeel＠torproject.org 11 Sep '19

11 Sep '19

commit 6368b1b91f9cf373048c9f13d1af091c5389f72d Author: sabita <35147757+sabitarao(a)users.noreply.github.com> Date: Sun Sep 8 07:37:56 2019 +0530 Update trademark FAQ link in footer will-fix https://dip.torproject.org/web/tpo/issues/39 partly --- templates/macros/footer.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/macros/footer.html b/templates/macros/footer.html index 90b9dfd..e3c90c8 100644 --- a/templates/macros/footer.html +++ b/templates/macros/footer.html @@ -1,3 +1,3 @@ {% macro render_faq() %} - <a href="https://www.torproject.org/docs/trademark-faq" target="_blank" class="text-primary text-light">FAQ</a> + <a href="https://www.torproject.org/about/trademark/" target="_blank" class="text-primary text-light">FAQ</a> {% endmacro %}

1 0