April 2018 - tor-commits - lists.torproject.org

[tor-browser-build/master] Bug 25420: update gcc to 6.4.0 for the Windows build
by gk＠torproject.org 11 Apr '18

11 Apr '18

commit d3e2dd7fad0c5a6fc0171719b6eb3f9e0883d84f Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Feb 28 12:02:33 2018 +0100 Bug 25420: update gcc to 6.4.0 for the Windows build --- projects/mingw-w64/build | 2 +- projects/mingw-w64/config | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/projects/mingw-w64/build b/projects/mingw-w64/build index 8d3e567..8ce5048 100644 --- a/projects/mingw-w64/build +++ b/projects/mingw-w64/build @@ -21,7 +21,7 @@ make install cd /var/tmp/build mkdir gcc cd gcc -tar xjf $rootdir/gcc-[% c("var/gcc_version") %].tar.bz2 +tar xJf $rootdir/gcc-[% c("var/gcc_version") %].tar.xz # We don't want to link against msvcrt.dll due to bug 9084. [% c("arch") %]-w64-mingw32-g++ -dumpspecs > $distdir/msvcr100.spec sed 's/msvcrt/msvcr100/' -i $distdir/msvcr100.spec diff --git a/projects/mingw-w64/config b/projects/mingw-w64/config index 5bfc93f..01d0c37 100644 --- a/projects/mingw-w64/config +++ b/projects/mingw-w64/config @@ -6,7 +6,7 @@ version: '[% c("abbrev") %]' var: container: use_container: 1 - gcc_version: 5.4.0 + gcc_version: 6.4.0 deps: - automake - build-essential @@ -30,7 +30,7 @@ targets: - g++-mingw-w64-x86-64 input_files: - project: container-image - - URL: 'https://ftp.gnu.org/gnu/gcc/gcc-[% c("var/gcc_version") %]/gcc-[% c("var/gcc_version") %].tar.bz2' - sha256sum: 608df76dec2d34de6558249d8af4cbee21eceddbcb580d666f7a5a583ca3303a + - URL: 'https://ftp.gnu.org/gnu/gcc/gcc-[% c("var/gcc_version") %]/gcc-[% c("var/gcc_version") %].tar.xz' + sha256sum: 850bf21eafdfe5cd5f6827148184c08c4a0852a37ccf36ce69855334d2c914d4 - name: binutils project: binutils

1 0

[tor-browser-build/master] Merge remote-tracking branch 'boklm/bug_25420_v4'
by gk＠torproject.org 11 Apr '18

11 Apr '18

commit dcce85b6d858d5438bdc68098e846c8ea73c5df6 Merge: 8e21b34 d3e2dd7 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Apr 11 08:28:31 2018 +0000 Merge remote-tracking branch 'boklm/bug_25420_v4' projects/mingw-w64/build | 2 +- projects/mingw-w64/config | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-)

1 0

[tor-browser/tor-browser-52.7.3esr-8.0-1] Bug 1372870 - Compiling with mingw-w64 based on GCC 6.3.0 breaks (operands to ?: have different types) r=mattwoodrow
by gk＠torproject.org 11 Apr '18

11 Apr '18

commit d463bad82114ae420b165f8c3f2a690b9d663a19 Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 22 17:33:39 2017 +0200 Bug 1372870 - Compiling with mingw-w64 based on GCC 6.3.0 breaks (operands to ?: have different types) r=mattwoodrow --- gfx/layers/d3d11/TextureD3D11.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gfx/layers/d3d11/TextureD3D11.h b/gfx/layers/d3d11/TextureD3D11.h index 831342aa2e0b..bd0fbf659777 100644 --- a/gfx/layers/d3d11/TextureD3D11.h +++ b/gfx/layers/d3d11/TextureD3D11.h @@ -237,7 +237,7 @@ public: virtual ID3D11ShaderResourceView* GetShaderResourceView() override; // Returns nullptr if this texture was created by a DXGI TextureHost. - virtual DataTextureSource* AsDataTextureSource() override { return mAllowTextureUploads ? this : false; } + virtual DataTextureSource* AsDataTextureSource() override { return mAllowTextureUploads ? this : nullptr; } virtual void DeallocateDeviceData() override { mTexture = nullptr; }

1 0

[tor-browser/tor-browser-52.7.3esr-8.0-1] Bug 1389965 Redefine macros to inline functions to fix MinGW build r=jfkthame
by gk＠torproject.org 11 Apr '18

11 Apr '18

commit 5a3775152eac3be01e3e947214748e33712bec68 Author: Tom Ritter <tom(a)mozilla.com> Date: Mon Oct 2 12:46:26 2017 -0500 Bug 1389965 Redefine macros to inline functions to fix MinGW build r=jfkthame MozReview-Commit-ID: 55Rr9Tk2tdD --- gfx/graphite2/src/MozGrMalloc.h | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/gfx/graphite2/src/MozGrMalloc.h b/gfx/graphite2/src/MozGrMalloc.h index acaae1236c49..0a853ab5d322 100644 --- a/gfx/graphite2/src/MozGrMalloc.h +++ b/gfx/graphite2/src/MozGrMalloc.h @@ -12,8 +12,19 @@ #include "mozilla/mozalloc.h" -#define malloc moz_xmalloc -#define calloc moz_xcalloc -#define realloc moz_xrealloc +inline void* malloc(size_t size) +{ + return moz_xmalloc(size); +} + +inline void* calloc(size_t nmemb, size_t size) +{ + return moz_xcalloc(nmemb, size); +} + +inline void* realloc(void *ptr, size_t size) +{ + return moz_xrealloc(ptr, size); +} #endif // MOZ_GR_MALLOC_H

1 0

[tor-browser/tor-browser-52.7.3esr-8.0-1] Bug 1407601 Revert to the previous behavior in MozGrMalloc.h for Linux, and add extern C to correct Solaris build break r=baku
by gk＠torproject.org 11 Apr '18

11 Apr '18

commit 645b11df3349f9045779d1d6c82d6c3722b6b2b2 Author: Tom Ritter <tom(a)mozilla.com> Date: Wed Oct 11 10:16:32 2017 -0500 Bug 1407601 Revert to the previous behavior in MozGrMalloc.h for Linux, and add extern C to correct Solaris build break r=baku MozReview-Commit-ID: GP6N6pcqQp --- gfx/graphite2/src/MozGrMalloc.h | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/gfx/graphite2/src/MozGrMalloc.h b/gfx/graphite2/src/MozGrMalloc.h index 0a853ab5d322..5d6a9f3910a9 100644 --- a/gfx/graphite2/src/MozGrMalloc.h +++ b/gfx/graphite2/src/MozGrMalloc.h @@ -12,19 +12,33 @@ #include "mozilla/mozalloc.h" -inline void* malloc(size_t size) +#if defined(XP_LINUX) + +#define malloc moz_xmalloc +#define calloc moz_xcalloc +#define realloc moz_xrealloc + +#else + +// extern "C" is needed for the Solaris build, while the inline +// functions are needed for the MinGW build. They break gcc 5.4.0 +// on Linux however, so keep the old #define's above for Linux + +extern "C" inline void* malloc(size_t size) { return moz_xmalloc(size); } -inline void* calloc(size_t nmemb, size_t size) +extern "C" inline void* calloc(size_t nmemb, size_t size) { return moz_xcalloc(nmemb, size); } -inline void* realloc(void *ptr, size_t size) +extern "C" inline void* realloc(void *ptr, size_t size) { return moz_xrealloc(ptr, size); } +#endif // defined(XP_LINUX) + #endif // MOZ_GR_MALLOC_H

1 0

[tor-browser-build/master] Bug 20302: Fix FTE compilation for Windows with GCC 6.4.0
by gk＠torproject.org 11 Apr '18

11 Apr '18

commit 8e21b3462302b724aabae24f32b1a7329a32b06a Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Apr 6 14:27:23 2018 +0200 Bug 20302: Fix FTE compilation for Windows with GCC 6.4.0 --- projects/libfte/bug20302.patch | 36 ++++++++++++++++++++++++++++++++++++ projects/libfte/build | 1 + projects/libfte/config | 2 ++ 3 files changed, 39 insertions(+) diff --git a/projects/libfte/bug20302.patch b/projects/libfte/bug20302.patch new file mode 100644 index 0000000..a190e1d --- /dev/null +++ b/projects/libfte/bug20302.patch @@ -0,0 +1,36 @@ +From a2cee5aaf51df9660de6df98ada6706546739d13 Mon Sep 17 00:00:00 2001 +From: Georg Koppen <gk(a)torproject.org> +Date: Fri, 7 Oct 2016 09:10:41 +0000 +Subject: [PATCH] Compiling with GCC 6.4.0 based mingw-w64 is broken + +Due to a bug in Python (https://bugs.python.org/issue11566) compiling +with a GCC 6.4.0 based mingw-w64 is broken. This patch adds a workaround +for this issue. + +diff --git a/setup.py b/setup.py +index f546f1f..721b113 100644 +--- a/setup.py ++++ b/setup.py +@@ -11,16 +11,16 @@ import os + + if os.name == 'nt': + libraries = ['gmp.dll'] ++ extra_compile_args=['-O3', '-fPIC', '-D_hypot=hypot'] + else: + libraries = ['gmp'] ++ extra_compile_args=['-O3', '-fPIC'] + + fte_cDFA = Extension('fte.cDFA', + include_dirs=['fte', + 'thirdparty/gmp/include', + ], +- extra_compile_args=['-O3', +- '-fPIC', +- ], ++ extra_compile_args=extra_compile_args, + library_dirs=['thirdparty/gmp/bin', + 'thirdparty/gmp/lib', + ], +-- +2.9.3 + diff --git a/projects/libfte/build b/projects/libfte/build index 9493f30..4f3455f 100644 --- a/projects/libfte/build +++ b/projects/libfte/build @@ -13,6 +13,7 @@ ln -s /var/tmp/dist/gmp thirdparty/gmp mkdir -p $distdir tar -C $distdir -xf $rootdir/[% c('input_files_by_name/obfsproxy') %] [% IF c("var/windows") -%] + patch -p1 < $rootdir/bug20302.patch pydir=$distdir/python export FAKETIME="[% USE date; GET date.format(c('timestamp'), format = '%Y-%m-%d %H:%M:%S') %]" export LD_PRELOAD= diff --git a/projects/libfte/config b/projects/libfte/config index 3b33cf6..2079040 100644 --- a/projects/libfte/config +++ b/projects/libfte/config @@ -29,3 +29,5 @@ input_files: name: gmp - project: obfsproxy name: obfsproxy + - filename: bug20302.patch + enable: '[% c("var/windows") %]'

1 0

[translation/support-miscellaneous] Update translations for support-miscellaneous
by translation＠torproject.org 11 Apr '18

11 Apr '18

commit eea336cdeb78a031d61b1e241cbf437a06ebb7cb Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 11 04:20:17 2018 +0000 Update translations for support-miscellaneous --- ga.json | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/ga.json b/ga.json index 41fe65a1f..9b6d39edd 100644 --- a/ga.json +++ b/ga.json @@ -32,20 +32,20 @@ "miscellaneus-6": { "id": "#miscellaneus-6", "control": "miscellaneus-6", - "title": "Does Tor keep logs?", - "description": "Tor doesn't keep any logs that could identify a particular user. We do take some safe measurements of how the network functions, which you can check out at <a href=\"https://metrics.torproject.org/\">Tor Metrics</a>." + "title": "An gcoinníonn Tor logchomhaid?", + "description": "Ní choinníonn Tor aon logchomhad a chabhródh linn úsáideoirí a aithint. Déanaimid tomhas slán ar fheidhmiú an líonra, agus tá na huimhreacha sin ar fáil ar <a href=\"https://metrics.torproject.org/\">Meadaracht Tor</a>." }, "miscellaneus-7": { "id": "#miscellaneus-7", "control": "miscellaneus-7", - "title": "Does Tor Project offer email service or other privacy protecting web services?", - "description": "No, we don't provide any online services. A list of all of our software projects can be found on our <a href=\"https://www.torproject.org/projects/projects.html.en\">projects page</a>." + "title": "An gcuireann Tionscadal Tor seirbhísí ríomhphoist ar fáil, nó aon seirbhís eile a chosnaíonn príobháideachas?", + "description": "Ní chuireann. Gheobhaidh tú liosta dár dtionscadail ar fad ar <a href=\"https://www.torproject.org/projects/projects.html.en\">an leathanach seo</a>." }, "miscellaneus-8": { "id": "#miscellaneus-8", "control": "miscellaneus-8", "title": "An bhfuil cead agam lógó Tor a úsáid i dtáirge de mo chuid?", - "description": "You can read all about that on our <a href=\"https://www.torproject.org/docs/trademark-faq.html\">Trademark faq page</a>." + "description": "Tá an t-eolas sin go léir ar fáil ar <a href=\"https://www.torproject.org/docs/trademark-faq.html\">an leathanach seo</a> a bhaineann le trádmharcanna." }, "miscellaneus-9": { "id": "#miscellaneus-9", @@ -56,31 +56,31 @@ "miscellaneus-10": { "id": "#miscellaneus-10", "control": "miscellaneus-10", - "title": "Does the Tor Project offer hosting?", - "description": "No, the Tor Project does not offer hosting services." + "title": "An gcuireann Tionscadal Tor seirbhísí óstála ar fáil?", + "description": "Ní chuireann." }, "miscellaneus-11": { "id": "#miscellaneus-11", "control": "miscellaneus-11", - "title": "Can I change the number of hops Tor uses?", + "title": "An féidir liom líon na n-athsheachadán a úsáideann Tor a athrú?", "description": "Right now the path length is hard-coded at 3 plus the number of nodes in your path that are sensitive. That is, in normal cases it's 3, but for example if you're accessing an onion service or a \".exit\" address it could be more.<p class=\"mb-3\"We don't want to encourage people to use paths longer than this as it increases load on the network without (as far as we can tell) providing any more security. Also, using paths longer than 3 could harm anonymity, first because it makes<a href=\"https://www.freehaven.net/anonbib/#ccs07-doa\">denial of security</a> ttacks easier, and second because it could act as an identifier if only a small number of users have the same path length as you." }, "miscellaneus-12": { "id": "#miscellaneus-12", "control": "miscellaneus-12", - "title": "How can I share files anonymously through Tor?", + "title": "Conas is féidir comhaid a roinnt trí Tor gan m'aitheantas a nochtadh?", "description": "Many exit nodes are configured to block certain types of file sharing traffic, such as bittorrent. Bittorrent in specific is <a href=\"https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea\">not anonymous over Tor</a>.For sharing files through Tor, <a href=\"https://onionshare.org/\">OnionShare</a> is a good option." }, "miscellaneus-13": { "id": "#miscellaneus-13", "control": "miscellaneus-13", "title": "An féidir liom VPN a úsáid le Tor?", - "description": "Generally speaking, we don't recommend using a VPN with Tor unless you're an advanced user who knows how to configure both in a way that doesn't compromise your privacy. You can find more detailed information about Tor + VPN at <a href=\"https://trac.torproject.org/projects/tor/wiki/doc/TorPlusVPN\">our wiki</a>." + "description": "Is féidir, ach ní mholaimid VPN a úsáid le Tor murar úsáideoir ardleibhéil thú agus mura bhfuil saineolas agat ar conas is féidir Tor agus an VPN a chumrú sa chaoi nach gcuirfidh siad do phríobháideachas i gcontúirt. Tá tuilleadh eolais faoi Tor agus VPN le chéile ar fáil ar <a href=\"https://trac.torproject.org/projects/tor/wiki/doc/TorPlusVPN\">an vicí</a>." }, "miscellaneus-14": { "id": "#miscellaneus-14", "control": "miscellaneus-14", - "title": "How do I volunteer with Tor Project?", + "title": "Cén chaoi a bhféadfainn páirt a ghlacadh i dTionscadal Tor?", "description": "Please see our <a href=\"https://www.torproject.org/getinvolved/volunteer.html.en\">volunteer page</a> for how to get involved!" }, "miscellaneus-15": {

1 0

[translation/support-miscellaneous] Update translations for support-miscellaneous
by translation＠torproject.org 11 Apr '18

11 Apr '18

commit 3f05f4a0459c4f7292f0a3eaa57e8a6e22b178cd Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 11 03:50:19 2018 +0000 Update translations for support-miscellaneous --- ga.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ga.json b/ga.json index 20d6ae31a..41fe65a1f 100644 --- a/ga.json +++ b/ga.json @@ -15,18 +15,18 @@ "id": "#miscellaneus-3", "control": "miscellaneus-3", "title": "Cé atá ag maoiniú Tor?", - "description": "Tor is funded by a number of different sponsors including US federal agencies, private foundations, and individual donors. Check out a list of all <a href=\"https://www.torproject.org/about/sponsors.html.en\">our sponsors</a> and a series of <a href=\"https://blog.torproject.org/category/tags/form-990\">blog posts</a> on our financial reports.We feel that talking openly about our funders and funding model is the best way to maintain trust with our community. We are always seeking more diversity in our funding sources, especially from foundations and individuals." + "description": "Tá Tor á mhaoiniú ag urraitheoirí éagsúla, gníomhaireachtaí rialtais SAM, fondúireachtaí príobháideacha, agus daoine aonair. Féach <a href=\"https://www.torproject.org/about/sponsors.html.en\">liosta ár gcuid urraitheoirí</a> chomh maith le sraith <a href=\"https://blog.torproject.org/category/tags/form-990\">postálacha blag</a> maidir lenár dtuarascálacha airgeadais.Creidimid go bhfuil sé tábhachtach a bheith oscailte maidir lenár gcuid maoinitheoirí agus ár samhail maoinithe chun iontaoibh an phobail a chothú. Bímid ag lorg foinsí maoinithe níos ilchineálaí i gcónaí, go háirithe ó fhondúireachtaí agus ó dhaoine aonair." }, "miscellaneus-4": { "id": "#miscellaneus-4", "control": "miscellaneus-4", "title": "An féidir liom Tor a úsáid in éindí le bittorrent?", - "description": "We do not recommend using Tor with bittorrent. For further details, please see our <a href=\"https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea\">blog post on the subject</a>." + "description": "Ní mholaimid duit Tor a úsáid in éindí le bittorrent. Chun tuilleadh eolais a fháil, féach ar <a href=\"https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea\">an phostáil bhlag seo</a>." }, "miscellaneus-5": { "id": "#miscellaneus-5", "control": "miscellaneus-5", - "title": "The files on my computer have been locked, and someone is demanding I download Tor Browser to pay a ransom for my files!", + "title": "Chuir duine éigin na comhaid ar mo ríomhaire faoi ghlas, agus tá sé nó sí ag éileamh go n-úsáidfinn Brabhsálaí Tor chun airgead fuascailte a íoc!", "description": "We are so sorry, but you have been infected with malware. The Tor Project did not create this malware. The malware authors are asking you to download Tor Browser presumably to contact them anonymously with the ransom they're demanding from you. If this is your first introduction to Tor Browser, we understand that you might think we're bad people who enable even worse people. But please consider that our software is used every day for a wide variety of purposes by human rights activists, journalists, domestic violence survivors, whistleblowers, law enforcement officers, and many others. Unfortunately, the protection that our software can provide to these groups of people can also be abused by criminals and malware authors. The Tor Project does not support or condone the use of our software for malicious purposes." }, "miscellaneus-6": {

1 0

[translation/support-miscellaneous] Update translations for support-miscellaneous
by translation＠torproject.org 11 Apr '18

11 Apr '18

commit 8e4bea2d913cfcb76ec31a2a9c97d9f74b68d231 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 11 01:20:20 2018 +0000 Update translations for support-miscellaneous --- ga.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ga.json b/ga.json index 585b8edc7..20d6ae31a 100644 --- a/ga.json +++ b/ga.json @@ -9,7 +9,7 @@ "id": "#miscellaneus-2", "control": "miscellaneus-2", "title": "Cén fáth nach gcuireann sibh cosc ar dhrochdhaoine a dhéanann drochrudaí ar líonra Tor?", - "description": "Tor is designed to defend human rights and privacy by preventing anyone from censoring things, even us. We hate that there are some people who use Tor to do terrible things, but we can't do anything to get rid of them without also undermining the human rights activists, journalists, abuse survivors, and other people who use Tor for good things. If we wanted to block certain people from using Tor, we'd basically be adding a backdoor to the software, which would open up our vulnerable users to attacks from bad regimes and other adversaries." + "description": "Dearadh Tor le cearta daonna agus príobháideachas a chosaint trí chosc a chur ar dhaoine a dhéanann cinsireacht, muidne san áireamh. Is fuath linn go ndéanann daoine rudaí uafásacha ar líonra Tor, ach ní féidir linn bata is bóthar a thabhairt dóibh gan go leor gníomhaíoch, iriseoirí, agus daoine a tháinig slán ó dhroch-íde a chur i gcontúirt. Dá gcuirfimis cosc ar dhaoine áirithe, an bealach amháin a bheadh againn é sin a dhéanamh ná saghas \"cúldorais\" a chur ar fáil, rud a chuirfeadh ár gcuid úsáideoirí i gcontúirt ó dhrochrialtais agus ó naimhde eile." }, "miscellaneus-3": { "id": "#miscellaneus-3",

1 0

[translation/support-miscellaneous] Update translations for support-miscellaneous
by translation＠torproject.org 11 Apr '18

11 Apr '18

commit dbf4ebb8b3669cbfb8cc23290af68c4574ca8852 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 11 00:20:18 2018 +0000 Update translations for support-miscellaneous --- ga.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ga.json b/ga.json index 5e4cbd099..585b8edc7 100644 --- a/ga.json +++ b/ga.json @@ -3,7 +3,7 @@ "id": "#miscellaneus-1", "control": "miscellaneus-1", "title": "Caithfidh mé úsáideoir Tor a lorg mar gheall ar chúis an-láidir. An gcabhródh sibh liom?", - "description": "There is nothing the Tor developers can do to trace Tor users. The same protections that keep bad people from breaking Tor's anonymity also prevent us from tracking users." + "description": "Níl forbróirí Tor in ann aon rud a dhéanamh chun úsáideoirí Tor a lorg, mar gheall ar an gnéithe céanna a chosnaíonn do chuid faisnéis phearsanta ar dhrochdhaoine." }, "miscellaneus-2": { "id": "#miscellaneus-2",

1 0