tor-commits August 2017

tor-commits@lists.torproject.org

17 participants
1132 discussions

[nyx/master] Pycodestyle compliance issues
by atagar＠torproject.org 09 Aug '17

09 Aug '17

commit 915b4d5f5c549d846aa0441b3528b48e354e16b9 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Aug 7 15:08:06 2017 -0700 Pycodestyle compliance issues Newer version of pycodestyle does some additional validation. Some aren't issues we're concerned with. --- test/menu.py | 25 ++++++++------- test/panel/connection.py | 81 +++++++++++++++++++++++++++--------------------- test/settings.cfg | 23 +++++++++----- test/subwindow.py | 25 +++++++-------- 4 files changed, 87 insertions(+), 67 deletions(-) diff --git a/test/menu.py b/test/menu.py index 162e08c..c935c27 100644 --- a/test/menu.py +++ b/test/menu.py @@ -33,7 +33,10 @@ def menu_cursor(*key_inputs): return cursor -NO_OP = lambda: None +def no_op(): + pass + + IS_CALLED = Container() TEST_MENU = Submenu('Root Submenu', [ @@ -59,7 +62,7 @@ class TestMenuItem(unittest.TestCase): IS_CALLED.value = False def test_parameters(self): - menu_item = MenuItem('Test Item', NO_OP) + menu_item = MenuItem('Test Item', no_op) self.assertEqual('', menu_item.prefix) self.assertEqual('Test Item', menu_item.label) @@ -84,11 +87,11 @@ class TestMenuItem(unittest.TestCase): root_submenu = Submenu('Root Submenu') middle_submenu = Submenu('Middle Submenu') - root_submenu.add(MenuItem('Middle Item 1', NO_OP)) - root_submenu.add(MenuItem('Middle Item 2', NO_OP)) + root_submenu.add(MenuItem('Middle Item 1', no_op)) + root_submenu.add(MenuItem('Middle Item 2', no_op)) root_submenu.add(middle_submenu) - bottom_item = MenuItem('Bottom Item', NO_OP) + bottom_item = MenuItem('Bottom Item', no_op) middle_submenu.add(bottom_item) self.assertEqual(middle_submenu, bottom_item.parent) @@ -118,16 +121,16 @@ class TestSubmenu(unittest.TestCase): self.assertEqual([], menu_item.children) menu_item = Submenu('Test Item', [ - MenuItem('Test Item 1', NO_OP), - MenuItem('Test Item 2', NO_OP), + MenuItem('Test Item 1', no_op), + MenuItem('Test Item 2', no_op), ]) self.assertEqual(2, len(menu_item.children)) def test_add(self): submenu = Submenu('Menu') - item_1 = MenuItem('Test Item 1', NO_OP) - item_2 = MenuItem('Test Item 2', NO_OP) + item_1 = MenuItem('Test Item 1', no_op) + item_2 = MenuItem('Test Item 2', no_op) self.assertEqual([], submenu.children) @@ -140,7 +143,7 @@ class TestSubmenu(unittest.TestCase): def test_add_raises_when_already_in_menu(self): submenu_1 = Submenu('Menu 1') submenu_2 = Submenu('Menu 2') - item = MenuItem('Test Item', NO_OP) + item = MenuItem('Test Item', no_op) submenu_1.add(item) self.assertRaises(ValueError, submenu_2.add, item) @@ -151,7 +154,7 @@ class TestRadioMenuItem(unittest.TestCase): IS_CALLED.value = False def test_parameters(self): - group = RadioGroup(NO_OP, 'selected_item') + group = RadioGroup(no_op, 'selected_item') menu_item = RadioMenuItem('Test Item', group, 'selected_item') self.assertEqual('[X] ', menu_item.prefix) diff --git a/test/panel/connection.py b/test/panel/connection.py index 30db919..f01d99a 100644 --- a/test/panel/connection.py +++ b/test/panel/connection.py @@ -199,20 +199,24 @@ class TestConnectionPanel(unittest.TestCase): tor_controller_mock().get_info.return_value = '82.121.9.9' tor_controller_mock().is_geoip_unavailable.return_value = False - test_data = { - line(): - ' 75.119.206.243:22 (de) --> 82.121.9.9:3531 15.4s (INBOUND)', - line(entry = MockEntry(entry_type = Category.CIRCUIT), line_type = LineType.CIRCUIT_HEADER): - ' 82.121.9.9 --> 75.119.206.243:22 (de) 15.4s (CIRCUIT)', - line(line_type = LineType.CIRCUIT, fingerprint = '1F43EE37A0670301AD9CB555D94AFEC2C89FDE86'): - ' | 82.121.9.9 1 / Guard', - line(line_type = LineType.CIRCUIT, fingerprint = 'B6D83EC2D9E18B0A7A33428F8CFA9C536769E209'): - ' | 82.121.9.9 2 / Middle', - line(line_type = LineType.CIRCUIT, fingerprint = 'E0BD57A11F00041A9789577C53A1B784473669E4'): - ' +- 82.121.9.9 3 / Exit', - } - - for test_line, expected in test_data.items(): + test_data = (( + line(), + ' 75.119.206.243:22 (de) --> 82.121.9.9:3531 15.4s (INBOUND)', + ), ( + line(entry = MockEntry(entry_type = Category.CIRCUIT), line_type = LineType.CIRCUIT_HEADER), + ' 82.121.9.9 --> 75.119.206.243:22 (de) 15.4s (CIRCUIT)', + ), ( + line(line_type = LineType.CIRCUIT, fingerprint = '1F43EE37A0670301AD9CB555D94AFEC2C89FDE86'), + ' | 82.121.9.9 1 / Guard', + ), ( + line(line_type = LineType.CIRCUIT, fingerprint = 'B6D83EC2D9E18B0A7A33428F8CFA9C536769E209'), + ' | 82.121.9.9 2 / Middle', + ), ( + line(line_type = LineType.CIRCUIT, fingerprint = 'E0BD57A11F00041A9789577C53A1B784473669E4'), + ' +- 82.121.9.9 3 / Exit', + )) + + for test_line, expected in test_data: rendered = test.render(nyx.panel.connection._draw_line, 0, 0, test_line, False, 80, TIMESTAMP + 15.4) self.assertEqual(expected, rendered.content) @@ -222,18 +226,21 @@ class TestConnectionPanel(unittest.TestCase): tor_controller_mock().get_info.return_value = '82.121.9.9' tor_controller_mock().is_geoip_unavailable.return_value = False - test_data = { - line(): - '75.119.206.243:22 (de) --> 82.121.9.9:3531', - line(entry = MockEntry(entry_type = Category.EXIT)): - '82.121.9.9:3531 --> 75.119.206.243:22 (SSH)', - line(line_type = LineType.CIRCUIT_HEADER, circ = MockCircuit(status = 'EXTENDING')): - 'Building... --> 82.121.9.9', - line(line_type = LineType.CIRCUIT): - '82.121.9.9', - } - - for test_line, expected in test_data.items(): + test_data = (( + line(), + '75.119.206.243:22 (de) --> 82.121.9.9:3531', + ), ( + line(entry = MockEntry(entry_type = Category.EXIT)), + '82.121.9.9:3531 --> 75.119.206.243:22 (SSH)', + ), ( + line(line_type = LineType.CIRCUIT_HEADER, circ = MockCircuit(status = 'EXTENDING')), + 'Building... --> 82.121.9.9', + ), ( + line(line_type = LineType.CIRCUIT), + '82.121.9.9', + )) + + for test_line, expected in test_data: rendered = test.render(nyx.panel.connection._draw_address_column, 0, 0, test_line, ()) self.assertEqual(expected, rendered.content) @@ -246,16 +253,18 @@ class TestConnectionPanel(unittest.TestCase): port_usage_tracker_mock().fetch.return_value = process - test_data = { - line(): - '1F43EE37A0670301AD9CB555D94AFEC2C89FDE86 Unnamed', - line(line_type = LineType.CIRCUIT_HEADER): - 'Purpose: General, Circuit ID: 7', - line(entry = MockEntry(entry_type = Category.CONTROL)): - 'firefox (722)', - } - - for test_line, expected in test_data.items(): + test_data = (( + line(), + '1F43EE37A0670301AD9CB555D94AFEC2C89FDE86 Unnamed', + ), ( + line(line_type = LineType.CIRCUIT_HEADER), + 'Purpose: General, Circuit ID: 7', + ), ( + line(entry = MockEntry(entry_type = Category.CONTROL)), + 'firefox (722)', + )) + + for test_line, expected in test_data: rendered = test.render(nyx.panel.connection._draw_line_details, 0, 0, test_line, 80, ()) self.assertEqual(expected, rendered.content) diff --git a/test/settings.cfg b/test/settings.cfg index 21679cd..dc1d851 100644 --- a/test/settings.cfg +++ b/test/settings.cfg @@ -1,15 +1,24 @@ -# PEP8 compliance issues that we're ignoreing. +# Pycodestyle compliance issues that we're ignoreing. -pep8.ignore E111 -pep8.ignore E114 -pep8.ignore E121 -pep8.ignore E501 -pep8.ignore E251 -pep8.ignore E127 +pycodestyle.ignore E111 +pycodestyle.ignore E114 +pycodestyle.ignore E121 +pycodestyle.ignore E501 +pycodestyle.ignore E251 +pycodestyle.ignore E127 +pycodestyle.ignore E722 # False positives from pyflakes. These are mappings between the path and the # issue. +pycodestyle.ignore nyx/__init__.py => E402: import nyx.curses +pycodestyle.ignore nyx/__init__.py => E402: import nyx.menu +pycodestyle.ignore nyx/__init__.py => E402: import nyx.panel +pycodestyle.ignore nyx/__init__.py => E402: import nyx.panel.config +pycodestyle.ignore nyx/__init__.py => E402: import nyx.panel.connection +pycodestyle.ignore nyx/__init__.py => E402: import nyx.popups +pycodestyle.ignore nyx/__init__.py => E402: import nyx.starter + pyflakes.ignore nyx/prereq.py => 'stem' imported but unused pyflakes.ignore nyx/prereq.py => 'curses' imported but unused pyflakes.ignore run_tests.py => 'pyflakes' imported but unused diff --git a/test/subwindow.py b/test/subwindow.py index 61246d2..bee91f3 100644 --- a/test/subwindow.py +++ b/test/subwindow.py @@ -69,10 +69,13 @@ EXPECTED_SCROLLBAR_BOTTOM = """ -+ """.strip() -NO_OP_HANDLER = lambda textbox, key: key DIMENSIONS = (40, 80) +def no_op_handler(textbox, key): + return key + + def _textbox(x = 0, text = ''): textbox = Mock() textbox.win.getyx.return_value = (0, x) @@ -185,31 +188,27 @@ class TestCurses(unittest.TestCase): self.assertEqual(curses.ascii.BEL, nyx.curses._handle_key(_textbox(), 410)) def test_handle_tab_completion_no_op(self): - tab_completion = lambda txt_input: ['GETINFO version'] - result = nyx.curses._handle_tab_completion(NO_OP_HANDLER, tab_completion, _textbox(), ord('a')) + result = nyx.curses._handle_tab_completion(no_op_handler, lambda txt_input: ['GETINFO version'], _textbox(), ord('a')) self.assertEqual(ord('a'), result) def test_handle_tab_completion_no_matches(self): - tab_completion = lambda txt_input: [] textbox = _textbox(text = 'GETINF') - result = nyx.curses._handle_tab_completion(NO_OP_HANDLER, tab_completion, textbox, 9) + result = nyx.curses._handle_tab_completion(no_op_handler, lambda txt_input: [], textbox, 9) self.assertEqual(None, result) # consumes input self.assertFalse(textbox.win.addstr.called) def test_handle_tab_completion_single_match(self): - tab_completion = lambda txt_input: ['GETINFO version'] textbox = _textbox(text = 'GETINF') - result = nyx.curses._handle_tab_completion(NO_OP_HANDLER, tab_completion, textbox, 9) + result = nyx.curses._handle_tab_completion(no_op_handler, lambda txt_input: ['GETINFO version'], textbox, 9) self.assertEqual(None, result) # consumes input self.assertEquals(call(0, 15), textbox.win.move.call_args) # move cursor to end self.assertEqual(call(0, 0, 'GETINFO version'), textbox.win.addstr.call_args) def test_handle_tab_completion_multiple_matches(self): - tab_completion = lambda txt_input: ['GETINFO version', 'GETINFO info/events'] textbox = _textbox(text = 'GETINF') - result = nyx.curses._handle_tab_completion(NO_OP_HANDLER, tab_completion, textbox, 9) + result = nyx.curses._handle_tab_completion(no_op_handler, lambda txt_input: ['GETINFO version', 'GETINFO info/events'], textbox, 9) self.assertEqual(None, result) # consumes input self.assertEquals(call(0, 8), textbox.win.move.call_args) # move cursor to end @@ -219,22 +218,22 @@ class TestCurses(unittest.TestCase): backlog = nyx.curses._TextBacklog(['GETINFO version']) textbox = _textbox() - self.assertEqual(ord('a'), backlog._handler(NO_OP_HANDLER, textbox, ord('a'))) + self.assertEqual(ord('a'), backlog._handler(no_op_handler, textbox, ord('a'))) self.assertFalse(textbox.win.addstr.called) def test_text_backlog_fills_history(self): backlog = nyx.curses._TextBacklog(['GETINFO version']) textbox = _textbox() - self.assertEqual(None, backlog._handler(NO_OP_HANDLER, textbox, curses.KEY_UP)) + self.assertEqual(None, backlog._handler(no_op_handler, textbox, curses.KEY_UP)) self.assertEqual(call(0, 0, 'GETINFO version'), textbox.win.addstr.call_args) def test_text_backlog_remembers_custom_input(self): backlog = nyx.curses._TextBacklog(['GETINFO version']) textbox = _textbox(text = 'hello') - self.assertEqual(None, backlog._handler(NO_OP_HANDLER, textbox, curses.KEY_UP)) + self.assertEqual(None, backlog._handler(no_op_handler, textbox, curses.KEY_UP)) self.assertEqual(call(0, 0, 'GETINFO version'), textbox.win.addstr.call_args) - self.assertEqual(None, backlog._handler(NO_OP_HANDLER, textbox, curses.KEY_DOWN)) + self.assertEqual(None, backlog._handler(no_op_handler, textbox, curses.KEY_DOWN)) self.assertEqual(call(0, 0, 'hello'), textbox.win.addstr.call_args)

1 0

[nyx/master] Scrollbars never reached bottom
by atagar＠torproject.org 09 Aug '17

09 Aug '17

commit 0aa4dcb621c1fa2e2f873636228958bc1d278c39 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Aug 9 12:19:35 2017 -0700 Scrollbars never reached bottom Damn the scrollbars have been a bigger headache than anything else thus far. There was an off-by-one error where we compared the number of scroll elements to the last index. --- nyx/curses.py | 5 +++-- test/subwindow.py | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/nyx/curses.py b/nyx/curses.py index d1cd5eb..2cb1b42 100644 --- a/nyx/curses.py +++ b/nyx/curses.py @@ -872,10 +872,11 @@ class _Subwindow(object): slider_size = (scrollbar_height * (bottom_index - top_index + 1)) // size max_slider_top = scrollbar_height - slider_size - 1 - # ensures slider isn't at top or bottom unless really at those extreme bounds + # Ensures slider isn't at top or bottom unless really at those extreme + # bounds. This is an index vs size comparison, hence the -1 offset. slider_top = 0 if top_index == 0 else max(slider_top, 1) - slider_top = max_slider_top if bottom_index == size else min(slider_top, max_slider_top - 1) + slider_top = max_slider_top if bottom_index == size - 1 else min(slider_top, max_slider_top - 1) # draws scrollbar slider diff --git a/test/subwindow.py b/test/subwindow.py index bee91f3..bc7ce5a 100644 --- a/test/subwindow.py +++ b/test/subwindow.py @@ -143,7 +143,7 @@ class TestCurses(unittest.TestCase): @require_curses def test_scrollbar_bottom(self): def _draw(subwindow): - subwindow.scrollbar(15, 21, 30, fill_char = '*') + subwindow.scrollbar(15, 20, 30, fill_char = '*') self.assertEqual(EXPECTED_SCROLLBAR_BOTTOM, test.render(_draw).content.strip())

1 0

[tor/master] fix description of PublishServerDescriptor
by arma＠torproject.org 09 Aug '17

09 Aug '17

commit 77bb85ba873425b6c7b48d4c93bde1f434a37314 Author: Roger Dingledine <arma(a)torproject.org> Date: Wed Aug 9 15:07:49 2017 -0400 fix description of PublishServerDescriptor the values of "v3" and "bridge" have to do with *where* you publish to, not whether you publish. --- doc/tor.1.txt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 11e4680d2..2e11534a6 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -1815,13 +1815,13 @@ is non-zero): + If this option is set to 0, Tor will not publish its descriptors to any directories. (This is useful if you're testing - out your server, or if you're using a Tor controller that handles directory - publishing for you.) Otherwise, Tor will publish its descriptors of all - type(s) specified. The default is "1", - which means "if running as a server, publish the - appropriate descriptors to the authorities". Other possibilities are - "v3", meaning "publish if running as a relay", and - "bridge", meaning "publish if running as a bridge". + out your server, or if you're using a Tor controller that handles + directory publishing for you.) Otherwise, Tor will publish its + descriptors of all type(s) specified. The default is "1", which + means "if running as a relay or bridge, publish descriptors to the + appropriate authorities". Other possibilities are "v3", meaning + "publish as if you're a relay", and "bridge", meaning "publish as + if you're a bridge". [[ShutdownWaitLength]] **ShutdownWaitLength** __NUM__:: When we get a SIGINT and we're a server, we begin shutting down:

1 0

[tor-browser-build/master] Remove hardened targets
by boklm＠torproject.org 09 Aug '17

09 Aug '17

commit 48b01dee52a63cb0f490b6303cb2a4e93855c118 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Aug 9 17:24:19 2017 +0200 Remove hardened targets --- .gitignore | 1 - Makefile | 3 --- projects/release/config | 11 ----------- 3 files changed, 15 deletions(-) diff --git a/.gitignore b/.gitignore index 7c83e82..c4c3919 100644 --- a/.gitignore +++ b/.gitignore @@ -6,7 +6,6 @@ /alpha /alpha_nightly /nightly -/hardened /testbuild /rbm.local.conf /logs diff --git a/Makefile b/Makefile index 274e11c..c45b0a1 100644 --- a/Makefile +++ b/Makefile @@ -77,9 +77,6 @@ testbuild-windows-i686: submodule-update testbuild-osx-x86_64: submodule-update $(rbm) build release --target testbuild --target torbrowser-osx-x86_64 -hardened-linux-x86_64: submodule-update - $(rbm) build release --target hardened --target torbrowser-linux-x86_64 - signtag-release: submodule-update $(rbm) build release --step signtag --target release diff --git a/projects/release/config b/projects/release/config index db62a95..ee318c2 100644 --- a/projects/release/config +++ b/projects/release/config @@ -60,17 +60,6 @@ targets: var: build_target: torbrowser-testbuild - hardened_nightly: - output_dir: 'hardened_nightly' - publish_dir: '[% c("var/today") %]' - var: - build_target: hardened - - hardened: - output_dir: 'hardened' - var: - build_target: hardened - input_files: # Release

1 0

[tor-browser-build/master] Fix var/publish_dir for nightly, alpha_nightly and testbuild
by boklm＠torproject.org 09 Aug '17

09 Aug '17

commit 48deeaa2fc6caeb378623c4d4cb1fc1142b9774a Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Aug 9 17:27:55 2017 +0200 Fix var/publish_dir for nightly, alpha_nightly and testbuild Fix an error introduced by 9d18c95bc22bb3df18c4839d21715ce7df9c1ee8. --- projects/release/config | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/projects/release/config b/projects/release/config index ee318c2..b785878 100644 --- a/projects/release/config +++ b/projects/release/config @@ -39,15 +39,15 @@ targets: nightly: output_dir: 'nightly' - publish_dir: '[% c("var/today") %]' var: build_target: nightly + publish_dir: '[% c("var/today") %]' alpha_nightly: output_dir: 'alpha_nightly' - publish_dir: '[% c("var/today") %]' var: build_target: alpha + publish_dir: '[% c("var/today") %]' alpha: output_dir: 'alpha/unsigned' @@ -56,9 +56,9 @@ targets: testbuild: output_dir: 'testbuild' - publish_dir: '' var: build_target: torbrowser-testbuild + publish_dir: '' input_files:

1 0

[tor/master] Document all the arguments of PublishServerDescriptor.
by nickm＠torproject.org 09 Aug '17

09 Aug '17

commit d655388a4a7c6a4415c8a48d410809591385c344 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 9 11:17:27 2017 -0400 Document all the arguments of PublishServerDescriptor. Implements 15645. --- changes/bug15645 | 3 +++ doc/tor.1.txt | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/changes/bug15645 b/changes/bug15645 new file mode 100644 index 000000000..781d20e09 --- /dev/null +++ b/changes/bug15645 @@ -0,0 +1,3 @@ + o Documentation: + - Document all values of PublishServerDescriptor in the manpage. + Closes ticket 15645. diff --git a/doc/tor.1.txt b/doc/tor.1.txt index b4a3cc5f7..11e4680d2 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -1819,7 +1819,9 @@ is non-zero): publishing for you.) Otherwise, Tor will publish its descriptors of all type(s) specified. The default is "1", which means "if running as a server, publish the - appropriate descriptors to the authorities". + appropriate descriptors to the authorities". Other possibilities are + "v3", meaning "publish if running as a relay", and + "bridge", meaning "publish if running as a bridge". [[ShutdownWaitLength]] **ShutdownWaitLength** __NUM__:: When we get a SIGINT and we're a server, we begin shutting down:

1 0

[tor-browser-build/master] Fix faketime path in ddmg.sh
by boklm＠torproject.org 09 Aug '17

09 Aug '17

commit 9a732cfa7e869ff50f679c9bdaa964892fa80328 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Aug 9 17:10:54 2017 +0200 Fix faketime path in ddmg.sh --- projects/tor-browser/ddmg.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/tor-browser/ddmg.sh b/projects/tor-browser/ddmg.sh index 20bd8f9..a715300 100755 --- a/projects/tor-browser/ddmg.sh +++ b/projects/tor-browser/ddmg.sh @@ -10,7 +10,7 @@ pushd [% src %] find . -type f | sed -e 's/^\.\///' | sort | xargs -i echo "{}={}" > [% filelist %] find . -type l | sed -e 's/^\.\///' | sort | xargs -i echo "{}={}" >> [% filelist %] -export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1 +export LD_PRELOAD=[% c("var/faketime_path") %] export FAKETIME="[% USE date; GET date.format(c('timestamp'), format = '%Y-%m-%d %H:%M:%S') %]" genisoimage -D -V "Tor Browser" -no-pad -R -apple -o "$dmg_tmpdir/tbb-uncompressed.dmg" -path-list [% filelist %] -graft-points -gid 20 -dir-mode 0755 -new-dir-mode 0755

1 0

[tor-browser-build/master] tbb-7.5a4-build2
by boklm＠torproject.org 09 Aug '17

09 Aug '17

commit 4195b8f52cc7e380e44f281f80f148e361a3b2e0 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Aug 9 15:11:21 2017 +0200 tbb-7.5a4-build2 --- rbm.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rbm.conf b/rbm.conf index 4efc57c..523a005 100644 --- a/rbm.conf +++ b/rbm.conf @@ -15,7 +15,7 @@ buildconf: var: torbrowser_version: '7.5a4' - torbrowser_build: 'build1' + torbrowser_build: 'build2' project_name: tor-browser multi_lingual: 0 build_mar: 1

1 0

[tor-browser-build/master] winpython: use wine to run python.exe
by boklm＠torproject.org 09 Aug '17

09 Aug '17

commit b67299f66b4f43deaf532b68a7cbca9cce60ba43 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Aug 9 15:04:20 2017 +0200 winpython: use wine to run python.exe We need wine to run python.exe. It seems it was working without explicitely using wine on my build machine, probably because of the binfmt configuration in the kernel of that machine. --- projects/winpython/build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/winpython/build b/projects/winpython/build index 2a30acc..5f53b9c 100644 --- a/projects/winpython/build +++ b/projects/winpython/build @@ -25,7 +25,7 @@ echo "FAKETIME = \"$FAKETIME\"" >> settings.py # Must pre-copy python27.dll into the build directory, or else py2exe can't find it. mkdir -p build/bdist.win32/winexe/bundle-2.7/ cp -a $distdir/python27.dll build/bdist.win32/winexe/bundle-2.7/ -LD_PRELOAD= $distdir/python.exe setup.py py2exe +LD_PRELOAD= wine $distdir/python.exe setup.py py2exe mkdir -p $distdir/wineroot/windows/ cp -a dist/gcc.exe dist/g++.exe dist/dllwrap.exe $distdir/wineroot/windows/ cp $rootdir/pyc-timestamp.sh $distdir/

1 0

[atlas/master] Revert "Hash the fingerprints from summary documents"
by irl＠torproject.org 09 Aug '17

09 Aug '17

commit f8b1a067011c035575eb3df5505ad000f46e2334 Author: Iain R. Learmonth <irl(a)fsfe.org> Date: Wed Aug 9 13:52:31 2017 +0100 Revert "Hash the fingerprints from summary documents" This reverts commit 40426f09f37ff84f93f20f156ab638ce27ff977a. --- js/collections/results.js | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/js/collections/results.js b/js/collections/results.js index 54cd36a..c341321 100644 --- a/js/collections/results.js +++ b/js/collections/results.js @@ -3,9 +3,8 @@ define([ 'jquery', 'underscore', 'backbone', - 'models/relay', - 'jssha' -], function($, _, Backbone, relayModel, jsSHA){ + 'models/relay' +], function($, _, Backbone, relayModel){ var resultsCollection = Backbone.Collection.extend({ model: relayModel, baseurl: 'https://onionoo.torproject.org/summary?search=', @@ -25,12 +24,12 @@ define([ } _.each(response.relays, function(relay, resultsC) { crelay = new relayModel; - crelay.fingerprint = new jsSHA(relay.f, "HEX").getHash("SHA-1", "HEX").toUpperCase(); + crelay.fingerprint = relay.f; relays.push(crelay); }); _.each(response.bridges, function(relay, resultsC) { crelay = new relayModel; - crelay.fingerprint = new jsSHA(relay.h, "HEX").getHash("SHA-1", "HEX").toUpperCase(); + crelay.fingerprint = relay.h; relays.push(crelay); }); if (relays.length == 0) {

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits August 2017