August 2017 - tor-commits - lists.torproject.org

[tor-browser-build/master] Synchronize mozconfig files with their version from tor-browser.git
by boklm＠torproject.org 10 Aug '17

10 Aug '17

commit aa96f1ab37786d11529f8266a1eeca07b04e7016 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Aug 10 12:39:09 2017 +0200 Synchronize mozconfig files with their version from tor-browser.git The main change is the removal of the --enable-jemalloc=4 option which was done with #22482. --- projects/firefox/mozconfig-linux-i686 | 3 +-- projects/firefox/mozconfig-linux-x86_64 | 3 +-- projects/firefox/mozconfig-osx-x86_64 | 3 +-- projects/firefox/mozconfig-windows-i686 | 2 +- 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/projects/firefox/mozconfig-linux-i686 b/projects/firefox/mozconfig-linux-i686 index 8b4ecb3..a7d75fa 100755 --- a/projects/firefox/mozconfig-linux-i686 +++ b/projects/firefox/mozconfig-linux-i686 @@ -31,7 +31,6 @@ ac_add_options --disable-debug ac_add_options --disable-maintenance-service ac_add_options --disable-crashreporter ac_add_options --disable-webrtc -# Let's not compile EME at least until we can enable ClearKey and only Clearkey. +# Let's make sure no preference is enabling either Adobe's or Google's CDM. ac_add_options --disable-eme #ac_add_options --disable-ctypes -ac_add_options --enable-jemalloc=4 diff --git a/projects/firefox/mozconfig-linux-x86_64 b/projects/firefox/mozconfig-linux-x86_64 index cde5b49..7d9ab1c 100755 --- a/projects/firefox/mozconfig-linux-x86_64 +++ b/projects/firefox/mozconfig-linux-x86_64 @@ -23,7 +23,6 @@ ac_add_options --disable-debug ac_add_options --disable-maintenance-service ac_add_options --disable-crashreporter ac_add_options --disable-webrtc -# Let's not compile EME at least until we can enable ClearKey and only Clearkey. +# Let's make sure no preference is enabling either Adobe's or Google's CDM. ac_add_options --disable-eme #ac_add_options --disable-ctypes -ac_add_options --enable-jemalloc=4 diff --git a/projects/firefox/mozconfig-osx-x86_64 b/projects/firefox/mozconfig-osx-x86_64 index 1658e18..bc7a30e 100644 --- a/projects/firefox/mozconfig-osx-x86_64 +++ b/projects/firefox/mozconfig-osx-x86_64 @@ -50,7 +50,6 @@ ac_add_options --disable-crashreporter ac_add_options --disable-maintenance-service ac_add_options --disable-webrtc ac_add_options --disable-tests -# Let's not compile EME at least until we can enable ClearKey and only Clearkey. -# (Apart from that there is no Adobe CRM module for OS X right now) +# Let's make sure no preference is enabling either Adobe's or Google's CDM. ac_add_options --disable-eme # ac_add_options --disable-ctypes diff --git a/projects/firefox/mozconfig-windows-i686 b/projects/firefox/mozconfig-windows-i686 index de86c49..af30573 100644 --- a/projects/firefox/mozconfig-windows-i686 +++ b/projects/firefox/mozconfig-windows-i686 @@ -21,7 +21,7 @@ ac_add_options --enable-verify-mar # We can't build the sandbox code with mingw-w64: # https://bugzilla.mozilla.org/show_bug.cgi?id=1042426 ac_add_options --disable-sandbox -# EME is not running without sandbox. Thus, don't compile it in the first place. +# Let's make sure no preference is enabling either Adobe's or Google's CDM. ac_add_options --disable-eme ac_add_options --disable-crashreporter ac_add_options --disable-maintenance-service

1 0

[tor-browser-build/master] README.HACKING: explain which mozconfig files we are using
by boklm＠torproject.org 10 Aug '17

10 Aug '17

commit 2c5b8113fa1fcbfaac8f5b3310b7e54a7ca38af2 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Aug 10 12:24:20 2017 +0200 README.HACKING: explain which mozconfig files we are using --- README.HACKING | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/README.HACKING b/README.HACKING index 221cc90..8dde2f2 100644 --- a/README.HACKING +++ b/README.HACKING @@ -222,6 +222,21 @@ commit you want to build. You will also need to comment the 'tag_gpg_id: 1' line (unless git_hash is pointing to a signed git tag). +The Firefox mozconfig files +--------------------------- + +In the gitian build, we are using the mozconfig files included in the +tor-browser.git repository (the .mozconfig, .mozconfig-mac and +.mozconfig-mingw files). + +In the rbm build however, we need to make some small modifications to +those files, so we are instead using mozconfig files stored in the +projects/firefox/ directory and ignoring the .mozconfig files from the +tor-browser.git repository. + +This could change in the future, when we are not using gitian anymore. + + Debugging a build error -----------------------

1 0

[tor-browser-build/master] Update tor-browser.git branch used in nightly
by boklm＠torproject.org 10 Aug '17

10 Aug '17

commit 8a999d86a27b8edd4dfc3ec8a497f13804d37f74 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Aug 10 12:43:52 2017 +0200 Update tor-browser.git branch used in nightly --- projects/firefox/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/firefox/config b/projects/firefox/config index e2cf727..1360772 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -27,7 +27,7 @@ targets: torbrowser_update_channel: release nightly: - git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1' + git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-2' tag_gpg_id: 0 var: torbrowser_update_channel: default

1 0

[tor-browser-bundle/master] Bug 23171: Copy snowflake doc files to proper location
by gk＠torproject.org 10 Aug '17

10 Aug '17

commit 32c98b835b5b104de5817d1d54ffaa3755a70b4d Author: Georg Koppen <gk(a)torproject.org> Date: Thu Aug 10 10:00:34 2017 +0000 Bug 23171: Copy snowflake doc files to proper location --- gitian/descriptors/mac/gitian-pluggable-transports.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gitian/descriptors/mac/gitian-pluggable-transports.yml b/gitian/descriptors/mac/gitian-pluggable-transports.yml index ebfcaa9..710f891 100644 --- a/gitian/descriptors/mac/gitian-pluggable-transports.yml +++ b/gitian/descriptors/mac/gitian-pluggable-transports.yml @@ -231,8 +231,8 @@ script: | cmp client client.stomped && (echo "No paths replaced in snowflake-client. Maybe the replacement failed or is no longer needed. Check descriptors/mac/gitian-pluggable-transports.yml"; exit 1) cp -a client.stomped $PTDIR/snowflake-client cd .. - mkdir -p $INSTDIR/Docs/snowflake - cp -a README.md LICENSE $INSTDIR/Docs/snowflake + mkdir -p $DOCSDIR/snowflake + cp -a README.md LICENSE $DOCSDIR/snowflake cd .. # Grabbing the result

1 0

[tor-browser-build/master] README.HACKING: explain how to test a firefox patch
by boklm＠torproject.org 10 Aug '17

10 Aug '17

commit cebdaf3303a4165f200d20e6d9f8c04ea90f15e2 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Aug 10 11:48:13 2017 +0200 README.HACKING: explain how to test a firefox patch --- README.HACKING | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/README.HACKING b/README.HACKING index 2687ed1..221cc90 100644 --- a/README.HACKING +++ b/README.HACKING @@ -198,6 +198,30 @@ To find the resulting file from the build, you can use 'ls -ltr out/tor/' to find the file with the last modification time. +Patching Firefox (or an other component) +---------------------------------------- + +If you want to test a firefox patch, the easiest way to do it is to +copy the patch file to the projects/firefox/ directory, then edit +projects/firefox/config to add the new patch to the list of input_files: + + - filename: patch-for-XXXX.patch + +Then edit projects/firefox/build to add a line somewhere (probably just +before running the configure script) to apply the patch: + + patch -p1 < $rootdir/patch-for-XXXX.patch + +You can now run 'make testbuild' (or an other build target) to start a +build with the patch. + +As an alternative, if you have your patch in a git repository, you can +edit projects/firefox/config to change the git_url option to point to +your git repository, and change the git_hash option to point to the +commit you want to build. You will also need to comment the +'tag_gpg_id: 1' line (unless git_hash is pointing to a signed git tag). + + Debugging a build error -----------------------

1 0

[webwml/master] almost all funders have https now!
by arma＠torproject.org 10 Aug '17

10 Aug '17

commit eed4c40eb6abd3a6c4f3787a0f4a81b04a183568 Author: Roger Dingledine <arma(a)torproject.org> Date: Thu Aug 10 01:14:49 2017 -0400 almost all funders have https now! ...the media democracy fund being the exception --- about/en/sponsors.wml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/about/en/sponsors.wml b/about/en/sponsors.wml index a0cc9268..37c6fdbe 100644 --- a/about/en/sponsors.wml +++ b/about/en/sponsors.wml @@ -26,18 +26,18 @@ <h3>Active Sponsors in 2017:</h3> <ul> <li><a href="<page donate/donate>">Tens of thousands of personal donations from individuals like you</a> (2006-present)</li> - <li><a href="http://code.google.com/soc/">Google Summer of Code</a> (2007-2014 and 2016-2017)</li> + <li><a href="https://developers.google.com/open-source/gsoc/">Google Summer of Code</a> (2007-2014 and 2016-2017)</li> <li><a href="https://www.mozilla.org/en-US/moss/">Mozilla</a> (2016-2017)</li> <li><a href="https://www.opentech.fund/">Open Technology Fund</a> (2012-2017)</li> <li><a href="http://mediademocracyfund.org/">Media Democracy Fund</a> (2016-2017)</li> - <li><a href="http://nsf.gov/">National Science Foundation</a> joint with Princeton University (2012-2018)</li> - <li><a href="http://nsf.gov/">National Science Foundation</a> via University of Minnesota (2013-2018)</li> - <li><a href="http://nsf.gov/">National Science Foundation</a> joint with Georgetown (2015-2018)</li> - <li><a href="http://nsf.gov/">National Science Foundation</a> joint with Rochester Institute of Technology (2016-2019)</li> - <li><a href="http://nsf.gov/">National Science Foundation</a> joint with University of Illinois at Chicago (2016-2018)</li> + <li><a href="https://nsf.gov/">National Science Foundation</a> joint with Princeton University (2012-2018)</li> + <li><a href="https://nsf.gov/">National Science Foundation</a> via University of Minnesota (2013-2018)</li> + <li><a href="https://nsf.gov/">National Science Foundation</a> joint with Georgetown (2015-2018)</li> + <li><a href="https://nsf.gov/">National Science Foundation</a> joint with Rochester Institute of Technology (2016-2019)</li> + <li><a href="https://nsf.gov/">National Science Foundation</a> joint with University of Illinois at Chicago (2016-2018)</li> <li><a href="https://www.fastly.com/">Fastly</a> (2016-2017)</li> - <li><a href="http://www.sri.com/">SRI International</a> (2011-2017)</li> - <li><a href="http://www.state.gov/j/drl/">US Department of State Bureau of Democracy, Human Rights, and Labor</a> (2013-2018)</li> + <li><a href="https://www.sri.com/">SRI International</a> (2011-2017)</li> + <li><a href="https://www.state.gov/j/drl/">US Department of State Bureau of Democracy, Human Rights, and Labor</a> (2013-2018)</li> <li><a href="https://www.team-cymru.org/">Team Cymru</a> (2009-present)</li> </ul>

1 0

[webwml/master] two nsf projects got no-cost-extensions, plus new drl grant
by arma＠torproject.org 10 Aug '17

10 Aug '17

commit 3d5e87a871b998514c2fdd7fa5eb615a69d27fbc Author: Roger Dingledine <arma(a)torproject.org> Date: Thu Aug 10 01:13:05 2017 -0400 two nsf projects got no-cost-extensions, plus new drl grant --- about/en/sponsors.wml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/about/en/sponsors.wml b/about/en/sponsors.wml index 0147926a..a0cc9268 100644 --- a/about/en/sponsors.wml +++ b/about/en/sponsors.wml @@ -30,14 +30,14 @@ <li><a href="https://www.mozilla.org/en-US/moss/">Mozilla</a> (2016-2017)</li> <li><a href="https://www.opentech.fund/">Open Technology Fund</a> (2012-2017)</li> <li><a href="http://mediademocracyfund.org/">Media Democracy Fund</a> (2016-2017)</li> - <li><a href="http://nsf.gov/">National Science Foundation</a> joint with Princeton University (2012-2017)</li> - <li><a href="http://nsf.gov/">National Science Foundation</a> via University of Minnesota (2013-2017)</li> + <li><a href="http://nsf.gov/">National Science Foundation</a> joint with Princeton University (2012-2018)</li> + <li><a href="http://nsf.gov/">National Science Foundation</a> via University of Minnesota (2013-2018)</li> <li><a href="http://nsf.gov/">National Science Foundation</a> joint with Georgetown (2015-2018)</li> <li><a href="http://nsf.gov/">National Science Foundation</a> joint with Rochester Institute of Technology (2016-2019)</li> <li><a href="http://nsf.gov/">National Science Foundation</a> joint with University of Illinois at Chicago (2016-2018)</li> <li><a href="https://www.fastly.com/">Fastly</a> (2016-2017)</li> <li><a href="http://www.sri.com/">SRI International</a> (2011-2017)</li> - <li><a href="http://www.state.gov/j/drl/">US Department of State Bureau of Democracy, Human Rights, and Labor</a> (2013-2016)</li> + <li><a href="http://www.state.gov/j/drl/">US Department of State Bureau of Democracy, Human Rights, and Labor</a> (2013-2018)</li> <li><a href="https://www.team-cymru.org/">Team Cymru</a> (2009-present)</li> </ul>

1 0

[webwml/master] Note that Nima took Alison's photo
by atagar＠torproject.org 09 Aug '17

09 Aug '17

commit ab6a050e8d96978fb05405c8d297a39a6c371b30 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Aug 9 12:54:35 2017 -0700 Note that Nima took Alison's photo Request from Nima so it meets the CC-by license. --- about/en/corepeople.wml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/about/en/corepeople.wml b/about/en/corepeople.wml index 72f5a682..37b92971 100644 --- a/about/en/corepeople.wml +++ b/about/en/corepeople.wml @@ -78,7 +78,7 @@ table.people tr td:first-child { <tr> <td> <a id="flexlibris"></a> - <div class="photo"><img src="$(IMGROOT)/people/flexlibris.png" alt="flexlibris" /></div> + <div class="photo"><img src="$(IMGROOT)/people/flexlibris.png" alt="flexlibris" title="Photo taken by Nima Fatemi" /></div> <div class="icon"><a href="https://twitter.com/flexlibris"><img src="$(IMGROOT)/twitter-small.png" alt="twitter" /></a></div> <div class="icon"><a href="https://db.torproject.org/fetchkey.cgi?fingerprint=FBF0E7DB1433018EE52D0DDA…"><img src="$(IMGROOT)/pgp-key.png" alt="pgp key" /></a></div> <div class="name"><a href="#flexlibris">Alison Macrina</a></div>

1 0

[stem/master] Test mistakenly connecting to SocksPort
by atagar＠torproject.org 09 Aug '17

09 Aug '17

commit 52d7ad697a257f4559133d281c7394a054e3733c Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Aug 8 10:56:04 2017 -0700 Test mistakenly connecting to SocksPort While setting up a relay I accidently had nyx connect to the ORPort rather than the SocksPort. This caused nyx to hang. Clearly that could be better. Connecting to the wrong port will be a pritty common mistake. I hoped to repro this with an integ test connecting to the SocksPort but no luck - this doesn't hang. Oh well. More investigation needed to get a repro, but at least we got a nice test out of it. --- test/integ/connection/connect.py | 52 ++++++++++++++++++++++++++++------------ 1 file changed, 37 insertions(+), 15 deletions(-) diff --git a/test/integ/connection/connect.py b/test/integ/connection/connect.py index fd087423..f4df233f 100644 --- a/test/integ/connection/connect.py +++ b/test/integ/connection/connect.py @@ -2,30 +2,28 @@ Integration tests for the connect_* convenience functions. """ -import sys import unittest +import stem.connection +import test.require +import test.runner + try: from StringIO import StringIO except ImportError: from io import StringIO -import stem.connection -import test.require -import test.runner +try: + # added in python 3.3 + from unittest.mock import patch +except ImportError: + from mock import patch class TestConnect(unittest.TestCase): - def setUp(self): - # prevents the function from printing to the real stdout - self.original_stdout = sys.stdout - sys.stdout = StringIO() - - def tearDown(self): - sys.stdout = self.original_stdout - @test.require.controller - def test_connect(self): + @patch('sys.stdout', new_callable = StringIO) + def test_connect(self, stdout_mock): """ Basic sanity checks for the connect function. """ @@ -40,9 +38,11 @@ class TestConnect(unittest.TestCase): controller = None) test.runner.exercise_controller(self, control_socket) + self.assertEqual('', stdout_mock.getvalue()) @test.require.controller - def test_connect_port(self): + @patch('sys.stdout', new_callable = StringIO) + def test_connect_port(self, stdout_mock): """ Basic sanity checks for the connect_port function. """ @@ -58,11 +58,13 @@ class TestConnect(unittest.TestCase): if test.runner.Torrc.PORT in runner.get_options(): test.runner.exercise_controller(self, control_socket) control_socket.close() + self.assertEqual('', stdout_mock.getvalue()) else: self.assertEqual(control_socket, None) @test.require.controller - def test_connect_socket_file(self): + @patch('sys.stdout', new_callable = StringIO) + def test_connect_socket_file(self, stdout_mock): """ Basic sanity checks for the connect_socket_file function. """ @@ -78,5 +80,25 @@ class TestConnect(unittest.TestCase): if test.runner.Torrc.SOCKET in runner.get_options(): test.runner.exercise_controller(self, control_socket) control_socket.close() + self.assertEqual('', stdout_mock.getvalue()) else: self.assertEqual(control_socket, None) + + @test.require.controller + @patch('sys.stdout', new_callable = StringIO) + def test_connect_to_socks_port(self, stdout_mock): + """ + Common user gotcha is connecting to the SocksPort or ORPort rather than the + ControlPort. Testing that connecting to the SocksPort errors in a + reasonable way. + """ + + runner = test.runner.get_runner() + + control_socket = stem.connection.connect_port( + port = test.runner.SOCKS_PORT, + chroot_path = runner.get_chroot(), + controller = None) + + self.assertEqual(None, control_socket) + self.assertEqual('Please check in your torrc that 1112 is the ControlPort. Maybe you\nconfigured it to be the ORPort or SocksPort instead?\n', stdout_mock.getvalue())

1 0

[nyx/master] Drop python 2.6 support
by atagar＠torproject.org 09 Aug '17

09 Aug '17

commit 774cc32ebea0b08078053a8ea6c5fe3a9d5beea7 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Aug 7 12:41:52 2017 -0700 Drop python 2.6 support Stem still supports python 2.6, and our codebase probably works with it too. However, there's still a couple reasons to drop official support... 1. Stem will be dropping python 2.6 support in its 2.x release. Python deprecated 2.6 long ago, and there's quite a few hacks in Stem's codebase to provide compatibility. Those will be going away. Not sure when I'll be releasing Stem 2.x, but no double it'll be long before Nyx's 3.x major version, so might as well drop official 2.6 support now. 2. Python 2.6 packages are no longer available, making compatibility testing a pita. I've compiled obsolete python versions for testing before, and this is a chore I'd like to do without. --- web/changelog/index.html | 2 +- web/index.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/web/changelog/index.html b/web/changelog/index.html index de52df5..c95f522 100644 --- a/web/changelog/index.html +++ b/web/changelog/index.html @@ -52,7 +52,7 @@ <p>The following are only available within Nyx's <a href="#git">git repository</a>.</p> <p>From a user perspective little has changed, but this release is nothing less than a complete rewrite of our codebase. This adds long overdue <b>support for python 3.x</b>, test coverage, and migrate from TorCtl to <a href="https://stem.torproject.org/">Stem</a>.</p> - <p>Python 2.5 is no longer supported. Hopefully by now nobody will miss it. :P</p> + <p>Python 2.5 and 2.6 is no longer supported. Hopefully by now nobody will miss it. :P</p> <br> diff --git a/web/index.html b/web/index.html index 4910c66..06284ce 100644 --- a/web/index.html +++ b/web/index.html @@ -119,7 +119,7 @@ <li id="python_requirement"> <span>What Python versions is Nyx compatible with?</span> <div class="answer"> - <p>Nyx works with <b>Python 2.6 and greater</b>, including the Python 3.x series.</p> + <p>Nyx works with <b>Python 2.7 and greater</b>, including the Python 3.x series.</p> </div> </li>

1 0