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

[tor-browser-bundle/maint-7.0] Fix 7.0.5 release date
by gk＠torproject.org 05 Sep '17

05 Sep '17

commit 8c4abb9d01658f67f6a608db5a3b50a00eb0652d Author: Georg Koppen <gk(a)torproject.org> Date: Sat Sep 2 12:23:30 2017 +0000 Fix 7.0.5 release date --- Bundle-Data/Docs/ChangeLog.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 53c52b7..aace374 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,4 +1,4 @@ -Tor Browser 7.0.5 -- September 2 2017 +Tor Browser 7.0.5 -- September 4 2017 * All Platforms * Update Torbutton to 1.9.7.6 * Bug 22989: Fix dimensions of new windows on macOS

1 0

[tor-browser/tor-browser-52.3.0esr-7.0-1] squash! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 05 Sep '17

05 Sep '17

commit e3d89bee3d500a82193fcf2d284a7d096f6bf0b3 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Mon Sep 4 17:14:07 2017 -0700 squash! TB4: Tor Browser's Firefox preference overrides. Bug 23404: Add Noto Sans Buginese to the macOS whitelist --- browser/app/profile/000-tor-browser.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 5d209ccfdbe1..16c23be0d65a 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -369,12 +369,12 @@ pref("dom.securecontext.whitelist_onions", true); #ifdef MOZ_BUNDLED_FONTS #ifdef XP_MACOSX -pref("font.system.whitelist", "AppleGothic, Apple Color Emoji, Arial, Courier, Geneva, Georgia, Heiti TC, Helvetica, Helvetica Neue, .Helvetica Neue DeskInterface, Hiragino Kaku Gothic ProN, Lucida Grande, Monaco, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Tibetan, Noto Sans Yi, STHeiti, STIX Math, Tahoma, Thonburi, Times, Times New Roman, Verdana"); -pref("font.name-list.cursive.x-unicode", "Apple Chancery, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Tibetan, Noto Sans Yi"); -pref("font.name-list.fantasy.x-unicode", "Papyrus, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Tibetan, Noto Sans Yi"); -pref("font.name-list.monospace.x-unicode", "Courier, Arial, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Tibetan, Noto Sans Yi"); -pref("font.name-list.sans-serif.x-unicode", "Helvetica, Tahoma, Arial, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Tibetan, Noto Sans Yi"); -pref("font.name-list.serif.x-unicode", "Times, Arial, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Tibetan, Noto Sans Yi"); +pref("font.system.whitelist", "AppleGothic, Apple Color Emoji, Arial, Courier, Geneva, Georgia, Heiti TC, Helvetica, Helvetica Neue, .Helvetica Neue DeskInterface, Hiragino Kaku Gothic ProN, Lucida Grande, Monaco, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Buginese, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Tibetan, Noto Sans Yi, STHeiti, STIX Math, Tahoma, Thonburi, Times, Times New Roman, Verdana"); +pref("font.name-list.cursive.x-unicode", "Apple Chancery, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Buginese, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Tibetan, Noto Sans Yi"); +pref("font.name-list.fantasy.x-unicode", "Papyrus, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Buginese, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Tibetan, Noto Sans Yi"); +pref("font.name-list.monospace.x-unicode", "Courier, Arial, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Buginese, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Tibetan, Noto Sans Yi"); +pref("font.name-list.sans-serif.x-unicode", "Helvetica, Tahoma, Arial, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Buginese, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Tibetan, Noto Sans Yi"); +pref("font.name-list.serif.x-unicode", "Times, Arial, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Buginese, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Tibetan, Noto Sans Yi"); pref("font.name.cursive.ar", "Arial"); pref("font.name.fantasy.ar", "Arial"); pref("font.name.monospace.ar", "Arial");

1 0

[tor-browser/tor-browser-52.3.0esr-7.5-2] squash! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 05 Sep '17

05 Sep '17

commit 89417fed09e5f45c3078efcc1c9d297ebef622fe Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Mon Sep 4 17:14:07 2017 -0700 squash! TB4: Tor Browser's Firefox preference overrides. Bug 23404: Add Noto Sans Buginese to the macOS whitelist --- browser/app/profile/000-tor-browser.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 5d209ccfdbe1..16c23be0d65a 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -369,12 +369,12 @@ pref("dom.securecontext.whitelist_onions", true); #ifdef MOZ_BUNDLED_FONTS #ifdef XP_MACOSX -pref("font.system.whitelist", "AppleGothic, Apple Color Emoji, Arial, Courier, Geneva, Georgia, Heiti TC, Helvetica, Helvetica Neue, .Helvetica Neue DeskInterface, Hiragino Kaku Gothic ProN, Lucida Grande, Monaco, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Tibetan, Noto Sans Yi, STHeiti, STIX Math, Tahoma, Thonburi, Times, Times New Roman, Verdana"); -pref("font.name-list.cursive.x-unicode", "Apple Chancery, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Tibetan, Noto Sans Yi"); -pref("font.name-list.fantasy.x-unicode", "Papyrus, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Tibetan, Noto Sans Yi"); -pref("font.name-list.monospace.x-unicode", "Courier, Arial, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Tibetan, Noto Sans Yi"); -pref("font.name-list.sans-serif.x-unicode", "Helvetica, Tahoma, Arial, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Tibetan, Noto Sans Yi"); -pref("font.name-list.serif.x-unicode", "Times, Arial, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Tibetan, Noto Sans Yi"); +pref("font.system.whitelist", "AppleGothic, Apple Color Emoji, Arial, Courier, Geneva, Georgia, Heiti TC, Helvetica, Helvetica Neue, .Helvetica Neue DeskInterface, Hiragino Kaku Gothic ProN, Lucida Grande, Monaco, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Buginese, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Tibetan, Noto Sans Yi, STHeiti, STIX Math, Tahoma, Thonburi, Times, Times New Roman, Verdana"); +pref("font.name-list.cursive.x-unicode", "Apple Chancery, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Buginese, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Tibetan, Noto Sans Yi"); +pref("font.name-list.fantasy.x-unicode", "Papyrus, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Buginese, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Tibetan, Noto Sans Yi"); +pref("font.name-list.monospace.x-unicode", "Courier, Arial, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Buginese, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Tibetan, Noto Sans Yi"); +pref("font.name-list.sans-serif.x-unicode", "Helvetica, Tahoma, Arial, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Buginese, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Tibetan, Noto Sans Yi"); +pref("font.name-list.serif.x-unicode", "Times, Arial, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Buginese, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Tibetan, Noto Sans Yi"); pref("font.name.cursive.ar", "Arial"); pref("font.name.fantasy.ar", "Arial"); pref("font.name.monospace.ar", "Arial");

1 0

[translation/torbutton-torbuttondtd] Update translations for torbutton-torbuttondtd
by translation＠torproject.org 05 Sep '17

05 Sep '17

commit 60ea52da32f19b2840a8e9c3b673350aa2460229 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Sep 5 01:47:10 2017 +0000 Update translations for torbutton-torbuttondtd --- pt_BR/torbutton.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pt_BR/torbutton.dtd b/pt_BR/torbutton.dtd index c30395b44..4cc12cbc3 100644 --- a/pt_BR/torbutton.dtd +++ b/pt_BR/torbutton.dtd @@ -6,7 +6,7 @@ <!ENTITY torbutton.context_menu.preferences.key "S"> <!ENTITY torbutton.context_menu.networksettings "Configurações da Rede Tor..."> <!ENTITY torbutton.context_menu.networksettings.key "N"> -<!ENTITY torbutton.context_menu.downloadUpdate "Aplicar Atualizações do Navegador Tor..."> +<!ENTITY torbutton.context_menu.downloadUpdate "Procurar Atualizações do Navegador Tor..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Proteções contra Cookies..."> <!ENTITY torbutton.context_menu.cookieProtections.key "C">

1 0

[stem/master] Caching manual would error if schema was out of date
by atagar＠torproject.org 04 Sep '17

04 Sep '17

commit c6b473f2978dd8c679164de59950af4054b42116 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Sep 4 13:50:49 2017 -0700 Caching manual would error if schema was out of date STATIC CHECKS * /tmp/stem/cache_manual.py line 51 - undefined name 'exc' | print('Cached database schema is out of date (was %s, but current version is %s)' % (exc.database_schema, stem.manual.SCHEMA_VERSION)) --- cache_manual.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cache_manual.py b/cache_manual.py index 0d07fa5f..a3cd214b 100755 --- a/cache_manual.py +++ b/cache_manual.py @@ -48,7 +48,7 @@ if __name__ == '__main__': cached_manual, db_schema = None, None # local copy has been deleted if db_schema != stem.manual.SCHEMA_VERSION: - print('Cached database schema is out of date (was %s, but current version is %s)' % (exc.database_schema, stem.manual.SCHEMA_VERSION)) + print('Cached database schema is out of date (was %s, but current version is %s)' % (db_schema, stem.manual.SCHEMA_VERSION)) cached_manual = None latest_manual = stem.manual.Manual.from_remote()

1 0

[stem/master] Unexpected exception from test_from_man_when_manual_is_unavailable on BSD
by atagar＠torproject.org 04 Sep '17

04 Sep '17

commit b25c0523dd5138350acbb6407114ca31a4278eb6 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Sep 4 13:34:05 2017 -0700 Unexpected exception from test_from_man_when_manual_is_unavailable on BSD Like many of the other tests, this behaves differently on BSD and hence needs the same mock as OSX. --- test/unit/manual.py | 1 + 1 file changed, 1 insertion(+) diff --git a/test/unit/manual.py b/test/unit/manual.py index 70e28aaf..aa8cede1 100644 --- a/test/unit/manual.py +++ b/test/unit/manual.py @@ -298,6 +298,7 @@ class TestManual(unittest.TestCase): call_mock.assert_called_once_with('a2x -f manpage /no/such/path/tor.1.txt') @patch('stem.util.system.is_mac', Mock(return_value = False)) + @patch('stem.util.system.is_bsd', Mock(return_value = False)) @patch('stem.util.system.call', Mock(side_effect = OSError('man --encoding=ascii -P cat tor returned exit status 16'))) def test_from_man_when_manual_is_unavailable(self): exc_msg = "Unable to run 'man --encoding=ascii -P cat tor': man --encoding=ascii -P cat tor returned exit status 16"

1 0

[stem/master] Immutability check for set_conf() didn't work with python3
by atagar＠torproject.org 04 Sep '17

04 Sep '17

commit 1b9a68b10668ce2ef77422d0f4e7c10550c4564d Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Sep 4 13:47:34 2017 -0700 Immutability check for set_conf() didn't work with python3 Yet another bytes-verses-unicode gotcha. ====================================================================== ERROR: test_set_conf_when_immutable ---------------------------------------------------------------------- Traceback (most recent call last): File "/home/atagar/Desktop/stem/test/require.py", line 58, in wrapped return func(self, *args, **kwargs) File "/home/atagar/Desktop/stem/test/integ/control/controller.py", line 778, in test_set_conf_when_immutable self.assertRaisesRegexp(stem.InvalidArguments, "DisableAllSwap cannot be changed while tor's running", controller.set_conf, 'DisableAllSwap', '1') File "/home/atagar/Desktop/stem/stem/util/test_tools.py", line 272, in assertRaisesRegexp return super(original_type, self).assertRaisesRegexp(exc_type, exc_msg, func, *args, **kwargs) File "/usr/lib/python3.5/unittest/case.py", line 1311, in deprecated_func return original_func(*args, **kwargs) File "/usr/lib/python3.5/unittest/case.py", line 1258, in assertRaisesRegex return context.handle('assertRaisesRegex', args, kwargs) File "/usr/lib/python3.5/unittest/case.py", line 176, in handle callable_obj(*args, **kwargs) File "/home/atagar/Desktop/stem/stem/control.py", line 2303, in set_conf self.set_options({param: value}, False) File "/home/atagar/Desktop/stem/stem/control.py", line 2412, in set_options raise stem.InvalidRequest(response.code, response.message) stem.InvalidRequest: Transition not allowed: While Tor is running, changing DisableAllSwap is not allowed. ---------------------------------------------------------------------- --- stem/control.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/stem/control.py b/stem/control.py index 7dc632bb..048d9e90 100644 --- a/stem/control.py +++ b/stem/control.py @@ -328,7 +328,7 @@ Listener = stem.util.enum.UppercaseEnum( # torrc options that cannot be changed once tor's running -IMMUTABLE_CONFIG_OPTIONS = map(str.lower, ( +IMMUTABLE_CONFIG_OPTIONS = set(map(stem.util.str_tools._to_unicode, map(str.lower, ( 'AccelDir', 'AccelName', 'DataDirectory', @@ -344,7 +344,7 @@ IMMUTABLE_CONFIG_OPTIONS = map(str.lower, ( 'SyslogIdentityTag', 'TokenBucketRefillInterval', 'User', -)) +)))) LOG_CACHE_FETCHES = True # provide trace level logging for cache hits @@ -2398,7 +2398,7 @@ class Controller(BaseController): self._set_cache({'get_custom_options': None}) else: log.debug('%s (failed, code: %s, message: %s)' % (query, response.code, response.message)) - immutable_params = [k for k, v in params if k.lower() in IMMUTABLE_CONFIG_OPTIONS] + immutable_params = [k for k, v in params if stem.util.str_tools._to_unicode(k).lower() in IMMUTABLE_CONFIG_OPTIONS] if immutable_params: raise stem.InvalidArguments(message = "%s cannot be changed while tor's running" % ', '.join(sorted(immutable_params)), arguments = immutable_params)

1 0

[stem/master] Tests requiring man command can't work on bsd
by atagar＠torproject.org 04 Sep '17

04 Sep '17

commit 336a2a8680964db55610cd63b7b0dc292dfc71d1 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Sep 4 13:24:15 2017 -0700 Tests requiring man command can't work on bsd Several tests skipped on OSX need to also be skipped on BSD. There were also some other newer tests that probably aren't running on OSX. ====================================================================== ERROR: test_saving_manual_as_config ---------------------------------------------------------------------- Traceback (most recent call last): File "/tmp/stem/test/require.py", line 58, in wrapped return func(self, *args, **kwargs) File "/tmp/stem/test/unit/manual.py", line 205, in test_saving_manual_as_config manual = stem.manual.Manual.from_man(EXAMPLE_MAN_PATH) File "/tmp/stem/stem/manual.py", line 495, in from_man categories, config_options = _get_categories(man_output), OrderedDict() File "/tmp/stem/stem/manual.py", line 666, in _get_categories if lines[-1] == '': IndexError: list index out of range ---------------------------------------------------------------------- --- stem/manual.py | 2 +- test/unit/manual.py | 17 +++++++++++++---- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/stem/manual.py b/stem/manual.py index 6e4869cf..3440b36d 100644 --- a/stem/manual.py +++ b/stem/manual.py @@ -663,7 +663,7 @@ def _get_categories(content): if line and not line.startswith(' '): if category: - if lines[-1] == '': + if lines and lines[-1] == '': lines = lines[:-1] # sections end with an extra empty line categories[category] = lines diff --git a/test/unit/manual.py b/test/unit/manual.py index b7e0adfc..70e28aaf 100644 --- a/test/unit/manual.py +++ b/test/unit/manual.py @@ -153,8 +153,8 @@ class TestManual(unittest.TestCase): expand our example (or add another). """ - if stem.util.system.is_mac(): - self.skipTest('(man lacks --encoding arg on OSX, #18660)') + if stem.util.system.is_mac() or stem.util.system.is_bsd(): + self.skipTest('(man lacks --encoding arg on OSX and BSD, #18660)') return manual = stem.manual.Manual.from_man(EXAMPLE_MAN_PATH) @@ -174,8 +174,8 @@ class TestManual(unittest.TestCase): options. Unlike most other tests this doesn't require network access. """ - if stem.util.system.is_mac(): - self.skipTest('(man lacks --encoding arg on OSX, #18660)') + if stem.util.system.is_mac() or stem.util.system.is_bsd(): + self.skipTest('(man lacks --encoding arg on OSX and BSD, #18660)') return manual = stem.manual.Manual.from_man(UNKNOWN_OPTIONS_MAN_PATH) @@ -202,6 +202,10 @@ class TestManual(unittest.TestCase): Check that we can save and reload manuals as a config. """ + if stem.util.system.is_mac() or stem.util.system.is_bsd(): + self.skipTest('(man lacks --encoding arg on OSX and BSD, #18660)') + return + manual = stem.manual.Manual.from_man(EXAMPLE_MAN_PATH) with tempfile.NamedTemporaryFile(prefix = 'saved_test_manual.') as tmp: @@ -209,11 +213,16 @@ class TestManual(unittest.TestCase): loaded_manual = stem.manual.Manual.from_cache(tmp.name) self.assertEqual(manual, loaded_manual) + @test.require.command('man') def test_saving_manual_as_sqlite(self): """ Check that we can save and reload manuals as sqlite. """ + if stem.util.system.is_mac() or stem.util.system.is_bsd(): + self.skipTest('(man lacks --encoding arg on OSX and BSD, #18660)') + return + manual = stem.manual.Manual.from_man(EXAMPLE_MAN_PATH) with tempfile.NamedTemporaryFile(prefix = 'saved_test_manual.', suffix = '.sqlite') as tmp:

1 0

[tor-browser-build/master] Bug 23384: install tor, torsocks, screen on build-sunet-a.torproject.net
by boklm＠torproject.org 04 Sep '17

04 Sep '17

commit a03188749910eba898935f872b32770f8e12b0f8 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Sep 4 22:11:32 2017 +0200 Bug 23384: install tor, torsocks, screen on build-sunet-a.torproject.net --- tools/ansible/roles/useful-packages/tasks/main.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/ansible/roles/useful-packages/tasks/main.yml b/tools/ansible/roles/useful-packages/tasks/main.yml index a15fc28..5cee49f 100644 --- a/tools/ansible/roles/useful-packages/tasks/main.yml +++ b/tools/ansible/roles/useful-packages/tasks/main.yml @@ -8,3 +8,6 @@ - locales - vim-nox - tmux + - tor + - torsocks + - screen

1 0

[stem/master] Fix test_router_status_entry for python3
by atagar＠torproject.org 04 Sep '17

04 Sep '17

commit 982c36e23931b4f54f6a5f2a2c41244c4269de95 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Sep 4 13:05:18 2017 -0700 Fix test_router_status_entry for python3 Ick, that took me a while to track down. On python3 unit tests sometimes pass, and sometimes failed with... ====================================================================== FAIL: test_router_status_entry ---------------------------------------------------------------------- Traceback (most recent call last): File "/home/atagar/Desktop/stem/test/unit/descriptor/server_descriptor.py", line 296, in test_router_status_entry self.assertEqual('4F0069BF91C04581B7C3CA9272E2D3228D4EA571', desc.digest) AssertionError: '4F0069BF91C04581B7C3CA9272E2D3228D4EA571' != 'A863EFE8395C41C880782B89B850D20EDD242BDA' - 4F0069BF91C04581B7C3CA9272E2D3228D4EA571 + A863EFE8395C41C880782B89B850D20EDD242BDA This non-deterministic behavior was because the server descriptor's attributes were made from a dictionary, and hence had no defined ordering. With python 2.x they happened to always keep the same order, but with python3 it varied from run to run. Using OrderedDicts in this call path to ensure the order is consistent. --- stem/descriptor/__init__.py | 2 +- test/unit/descriptor/server_descriptor.py | 24 +++++++++++++++--------- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/stem/descriptor/__init__.py b/stem/descriptor/__init__.py index 66dc573b..5c6e5f3d 100644 --- a/stem/descriptor/__init__.py +++ b/stem/descriptor/__init__.py @@ -392,7 +392,7 @@ def _descriptor_content(attr = None, exclude = (), header_template = (), footer_ """ header_content, footer_content = [], [] - attr = {} if attr is None else dict(attr) # shallow copy since we're destructive + attr = {} if attr is None else OrderedDict(attr) # shallow copy since we're destructive for content, template in ((header_content, header_template), (footer_content, footer_template)): diff --git a/test/unit/descriptor/server_descriptor.py b/test/unit/descriptor/server_descriptor.py index b31ad688..7bf0b2cf 100644 --- a/test/unit/descriptor/server_descriptor.py +++ b/test/unit/descriptor/server_descriptor.py @@ -30,6 +30,12 @@ from test.unit.descriptor import ( ) try: + # Added in 2.7 + from collections import OrderedDict +except ImportError: + from stem.util.ordereddict import OrderedDict + +try: # added in python 3.3 from unittest.mock import Mock, patch except ImportError: @@ -270,14 +276,14 @@ Qlx9HNCqCY877ztFRC624ja2ql6A2hBcuoYMbkHjcQ4= exc_msg = 'Server descriptor lacks a fingerprint. This is an optional field, but required to make a router status entry.' self.assertRaisesRegexp(ValueError, exc_msg, desc_without_fingerprint.make_router_status_entry) - desc = RelayDescriptor.create({ - 'router': 'caerSidi 71.35.133.197 9001 0 0', - 'published': '2012-02-29 04:03:19', - 'fingerprint': '4F0C 867D F0EF 6816 0568 C826 838F 482C EA7C FE44', - 'or-address': ['71.35.133.197:9001', '[12ab:2e19:3bcf::02:9970]:9001'], - 'onion-key': '\n-----BEGIN RSA PUBLIC KEY-----%s-----END RSA PUBLIC KEY-----' % stem.descriptor.CRYPTO_BLOB, - 'signing-key': '\n-----BEGIN RSA PUBLIC KEY-----%s-----END RSA PUBLIC KEY-----' % stem.descriptor.CRYPTO_BLOB, - }).make_router_status_entry() + desc = RelayDescriptor.create(OrderedDict(( + ('router', 'caerSidi 71.35.133.197 9001 0 0'), + ('published', '2012-02-29 04:03:19'), + ('fingerprint', '4F0C 867D F0EF 6816 0568 C826 838F 482C EA7C FE44'), + ('or-address', ['71.35.133.197:9001', '[12ab:2e19:3bcf::02:9970]:9001']), + ('onion-key', '\n-----BEGIN RSA PUBLIC KEY-----%s-----END RSA PUBLIC KEY-----' % stem.descriptor.CRYPTO_BLOB), + ('signing-key', '\n-----BEGIN RSA PUBLIC KEY-----%s-----END RSA PUBLIC KEY-----' % stem.descriptor.CRYPTO_BLOB), + ))).make_router_status_entry() self.assertEqual(stem.descriptor.router_status_entry.RouterStatusEntryV3, type(desc)) self.assertEqual('caerSidi', desc.nickname) @@ -293,7 +299,7 @@ Qlx9HNCqCY877ztFRC624ja2ql6A2hBcuoYMbkHjcQ4= self.assertEqual([('71.35.133.197', 9001, False), ('12ab:2e19:3bcf::02:9970', 9001, True)], desc.or_addresses) self.assertEqual(None, desc.identifier_type) self.assertEqual(None, desc.identifier) - self.assertEqual('4F0069BF91C04581B7C3CA9272E2D3228D4EA571', desc.digest) + self.assertEqual('A863EFE8395C41C880782B89B850D20EDD242BDA', desc.digest) self.assertEqual(153600, desc.bandwidth) self.assertEqual(None, desc.measured) self.assertEqual(False, desc.is_unmeasured)

1 0