July 2015 - tor-commits - lists.torproject.org

[check/master] Appease go vet
by arlo＠torproject.org 09 Jul '15

09 Jul '15

commit eb0cc045c53374e7c3b833c8a59f775862fb599d Author: Arlo Breault <arlolra(a)gmail.com> Date: Wed Jul 8 20:42:10 2015 -0700 Appease go vet --- datastore.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/datastore.go b/datastore.go index 4ce9516..47ca981 100644 --- a/datastore.go +++ b/datastore.go @@ -240,7 +240,7 @@ func (e *Exits) Load(source io.Reader, update bool) error { if mask := net.ParseIP(r.Mask); r.IP != nil && mask != nil { m := make(net.IPMask, len(mask)) copy(m, mask) - r.IPNet = &net.IPNet{r.IP.Mask(m), m} + r.IPNet = &net.IPNet{IP: r.IP.Mask(m), Mask: m} } } }

1 0

[check/master] Run go vet && fmt before testing
by arlo＠torproject.org 09 Jul '15

09 Jul '15

commit 904d3360c637dc83b39cc49fb831e35a64bf2f96 Author: Arlo Breault <arlolra(a)gmail.com> Date: Wed Jul 8 21:06:18 2015 -0700 Run go vet && fmt before testing --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index bf23366..6264564 100644 --- a/Makefile +++ b/Makefile @@ -78,11 +78,12 @@ data/langs: data/ i18n: locale/ data/langs build: - go fmt go build # Add -i for installing latest version, -v for verbose test: build + ! gofmt -l . 2>&1 | read + go vet go test -v -run "$(filter)" cover: build

1 0

[check/master] Orfox UA updates, tests also changed
by arlo＠torproject.org 09 Jul '15

09 Jul '15

commit 644e1c21b682a911acbea567f55d156a084a8c5f Author: Amogh Pradeep <amoghbl1(a)gmail.com> Date: Wed Jul 8 17:23:30 2015 -0500 Orfox UA updates, tests also changed --- utils.go | 5 +++-- utils_test.go | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/utils.go b/utils.go index 9fc82d9..0872c15 100644 --- a/utils.go +++ b/utils.go @@ -55,10 +55,11 @@ func GetHost(r *http.Request) (host string, err error) { return } -var TBBUserAgents = regexp.MustCompile(`^Mozilla/5\.0 $((Windows NT 6\.1)|(Android; Mobile)); rv:[\d]+\.0$ Gecko/20100101 Firefox/[\d]+\.0$`) +var TBBUserAgents = regexp.MustCompile(`^Mozilla/5\.0 $Windows NT 6\.1; rv:[\d]+\.0$ Gecko/20100101 Firefox/[\d]+\.0$`) +var OrfoxUserAgents = regexp.MustCompile(`^Mozilla/5\.0 $Android; Mobile; rv:38.0$ Gecko/38.0 Firefox/38.0$`) func LikelyTBB(ua string) bool { - return TBBUserAgents.MatchString(ua) + return TBBUserAgents.MatchString(ua) || OrfoxUserAgents.MatchString(ua) } var HaveManual = map[string]bool{ diff --git a/utils_test.go b/utils_test.go index 4f60b57..aa47df9 100644 --- a/utils_test.go +++ b/utils_test.go @@ -10,7 +10,8 @@ var UserAgents = map[string]bool{ "Mozilla/5.0 (Windows NT 6.1; rv:10.0) Gecko/20100101 Firefox/10.0": true, "Mozilla/5.0 (Windows NT 6.1; rv:17.0) Gecko/20100101 Firefox/17.0": true, "Mozilla/5.0 (Windows NT 6.1; rv:24.0) Gecko/20100101 Firefox/24.0": true, - "Mozilla/5.0 (Android; Mobile; rv:24.0) Gecko/20100101 Firefox/24.0": true, + "Mozilla/5.0 (Android; Mobile; rv:31.0) Gecko/31.0 Firefox/31.0": false, + "Mozilla/5.0 (Android; Mobile; rv:38.0) Gecko/38.0 Firefox/38.0": true, } func TestLikelyTBB(t *testing.T) {

1 0

[translation/torbutton-abouttorproperties] Update translations for torbutton-abouttorproperties
by translation＠torproject.org 09 Jul '15

09 Jul '15

commit 3f0e28355591a83a51281ae01975af0fae785b37 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jul 8 22:46:23 2015 +0000 Update translations for torbutton-abouttorproperties --- it/abouttor.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/it/abouttor.properties b/it/abouttor.properties index b87cff0..6ce9894 100644 --- a/it/abouttor.properties +++ b/it/abouttor.properties @@ -22,6 +22,7 @@ <option value='gsoc2009-koryk'>gsoc2009-koryk</option> <option value='gsoc2009-koryk'>gsoc2009-koryk</option> <option value='gsoc2009-koryk'>gsoc2009-koryk</option> +<option value='gsoc2009-koryk'>gsoc2009-koryk</option> </select> <input type='submit' name='' value='switch'/></form></td></tr> <tr><td class='sub'>Firefox extension for safe web browsing while using Tor</td><td class='sub right'>The Tor Project</td></tr></table> <table class='tabs'><tr><td>

1 0

[translation/mat-gui_completed] Update translations for mat-gui_completed
by translation＠torproject.org 09 Jul '15

09 Jul '15

commit 757c6643e1d0034d528ae300d178146488d043b2 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jul 8 22:45:41 2015 +0000 Update translations for mat-gui_completed --- it.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/it.po b/it.po index d94abbb..bb2ecee 100644 --- a/it.po +++ b/it.po @@ -14,9 +14,9 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-12-31 04:53+0100\n" -"PO-Revision-Date: 2015-06-16 20:37+0000\n" +"PO-Revision-Date: 2015-07-08 22:43+0000\n" "Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" -"Language-Team: Italian (http://www.transifex.com/projects/p/torproject/language/it/)\n" +"Language-Team: Italian (http://www.transifex.com/p/torproject/language/it/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n"

1 0

[translation/mat-gui] Update translations for mat-gui
by translation＠torproject.org 09 Jul '15

09 Jul '15

commit c2827ae218e0694012302420fe3819f1c8a3e7a6 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jul 8 22:45:35 2015 +0000 Update translations for mat-gui --- it.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/it.po b/it.po index d94abbb..bb2ecee 100644 --- a/it.po +++ b/it.po @@ -14,9 +14,9 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-12-31 04:53+0100\n" -"PO-Revision-Date: 2015-06-16 20:37+0000\n" +"PO-Revision-Date: 2015-07-08 22:43+0000\n" "Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" -"Language-Team: Italian (http://www.transifex.com/projects/p/torproject/language/it/)\n" +"Language-Team: Italian (http://www.transifex.com/p/torproject/language/it/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n"

1 0

[tor-messenger-build/master] Disable 'Search with...' context menu (closes #16477)
by sukhbir＠torproject.org 08 Jul '15

08 Jul '15

commit 7cd77ca26c2ee1f0565382a6e9c2a66d04caf4ec Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Wed Jul 8 13:51:29 2015 -0400 Disable 'Search with...' context menu (closes #16477) In addition to disabling the context menu, remove the 'Manage Search Engines' option in the preferences window. --- projects/instantbird/config | 2 ++ projects/instantbird/search-context-menu.patch | 38 +++++++++++++++++++++ projects/instantbird/search-preferences-xul.patch | 21 ++++++++++++ 3 files changed, 61 insertions(+) diff --git a/projects/instantbird/config b/projects/instantbird/config index 1e17ae9..80575fa 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -86,6 +86,8 @@ input_files: - filename: xmpp-resource.patch - filename: xmpp-username-split.patch - filename: version.patch + - filename: search-context-menu.patch + - filename: search-preferences-xul.patch - filename: branding/blistWindow.png - filename: branding/blistWindow16.png - filename: branding/blistWindow48.png diff --git a/projects/instantbird/search-context-menu.patch b/projects/instantbird/search-context-menu.patch new file mode 100644 index 0000000..20056c2 --- /dev/null +++ b/projects/instantbird/search-context-menu.patch @@ -0,0 +1,38 @@ +diff --git a/im/content/nsContextMenu.js b/im/content/nsContextMenu.js +--- a/im/content/nsContextMenu.js ++++ b/im/content/nsContextMenu.js +@@ -462,33 +462,17 @@ nsContextMenu.prototype = { + var selectedText = getBrowserSelection(16); + + if (!selectedText) + return false; + + if (selectedText.length > 15) + selectedText = selectedText.substr(0,15) + this.ellipsis; + +- var engine = Services.search.defaultEngine; +- if (!engine) +- return false; +- +- // format "Search <engine> for <selection>" string to show in menu +- var bundle = document.getElementById("bundle_instantbird"); +- var menuLabel = bundle.getFormattedString("contextMenuSearchText", +- [engine.name, +- selectedText]); +- document.getElementById("context-searchselect").label = menuLabel; +- document.getElementById("context-searchselect").accessKey = +- bundle.getString("contextMenuSearchText.accesskey"); +- menuLabel = bundle.getFormattedString("contextMenuSearchWith", +- [selectedText]); +- document.getElementById("context-searchselect-with").label = menuLabel; +- +- return true; ++ return false; + }, + + // Returns true if anything is selected. + isContentSelection: function() { + return !document.commandDispatcher.focusedWindow.getSelection().isCollapsed; + } + }; + diff --git a/projects/instantbird/search-preferences-xul.patch b/projects/instantbird/search-preferences-xul.patch new file mode 100644 index 0000000..647d9a5 --- /dev/null +++ b/projects/instantbird/search-preferences-xul.patch @@ -0,0 +1,21 @@ +diff --git a/im/content/preferences/advanced.xul b/im/content/preferences/advanced.xul +--- a/im/content/preferences/advanced.xul ++++ b/im/content/preferences/advanced.xul +@@ -135,17 +135,6 @@ + preference="layout.spellcheckDefault"/> + </groupbox> + +-  +- <groupbox id="searchEnginesGroup" orient="horizontal" align="center"> +- <caption label="&searchEnginesGroup.label;"/> +- +- <description control="manageSearchEnginesButton" +- flex="1">&searchEnginesDesc.label;</description> +- <button id="manageSearchEnginesButton" label="&searchEngines.label;" +- accesskey="&searchEngines.accesskey;" +- oncommand="gAdvancedPane.showSearchEngineManager();"/> +- </groupbox> +- + #ifdef HAVE_SHELL_SERVICE +  + <groupbox id="systemDefaultsGroup" orient="horizontal">

1 0

[orbot/master] update to 15.0.1-RC-1 (PIE only)
by n8fr8＠torproject.org 08 Jul '15

08 Jul '15

commit f13f7c82dcbe9c8bbe5d226daf1594a667e86db1 Author: Nathan Freitas <nathan(a)freitas.net> Date: Wed Jul 8 13:04:13 2015 -0400 update to 15.0.1-RC-1 (PIE only) --- AndroidManifest.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index f81f3f4..75cf716 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.torproject.android" - android:versionName="15.0.1-beta-3" - android:versionCode="150013" + android:versionName="15.0.1-RC-1-PIE" + android:versionCode="15012110" android:installLocation="auto" >

1 0

[stem/master] Remove the custom check for indentation with tabs.
by atagar＠torproject.org 08 Jul '15

08 Jul '15

commit aa381a14380cb2bd06cee77088de7399f8302b88 Author: cypherpunks <cypherpunks(a)torproject.org> Date: Tue Jul 7 15:54:06 2015 +0200 Remove the custom check for indentation with tabs. The pep8 API has the same check which makes the custom check redundant. Indentation with tabs errors are assigned error code W191. --- run_tests.py | 2 +- stem/util/test_tools.py | 10 +++------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/run_tests.py b/run_tests.py index 47e977c..d82f38a 100755 --- a/run_tests.py +++ b/run_tests.py @@ -78,7 +78,7 @@ PYFLAKES_TASK = Task( PEP8_TASK = Task( 'running pep8', stem.util.test_tools.stylistic_issues, - args = (SRC_PATHS, True, True, True, True, True), + args = (SRC_PATHS, True, True, True, True), is_required = False, print_result = False, ) diff --git a/stem/util/test_tools.py b/stem/util/test_tools.py index af9c944..2694327 100644 --- a/stem/util/test_tools.py +++ b/stem/util/test_tools.py @@ -116,7 +116,7 @@ def is_pep8_available(): return False -def stylistic_issues(paths, check_two_space_indents = False, check_newlines = False, check_trailing_whitespace = False, check_exception_keyword = False, prefer_single_quotes = False): +def stylistic_issues(paths, check_newlines = False, check_trailing_whitespace = False, check_exception_keyword = False, prefer_single_quotes = False): """ Checks for stylistic issues that are an issue according to the parts of PEP8 we conform to. You can suppress PEP8 issues by making a 'test' configuration @@ -161,8 +161,6 @@ def stylistic_issues(paths, check_two_space_indents = False, check_newlines = Fa Added the prefer_single_quotes option. :param list paths: paths to search for stylistic issues - :param bool check_two_space_indents: check for two space indentations and - that no tabs snuck in :param bool check_newlines: check that we have standard newlines (\\n), not windows (\\r\\n) nor classic mac (\\r) :param bool check_trailing_whitespace: check that our lines don't end with @@ -194,7 +192,7 @@ def stylistic_issues(paths, check_two_space_indents = False, check_newlines = Fa style_checker = pep8.StyleGuide(ignore = CONFIG['pep8.ignore'], reporter = StyleReport) style_checker.check_files(list(_python_files(paths))) - if check_two_space_indents or check_newlines or check_trailing_whitespace or check_exception_keyword: + if check_newlines or check_trailing_whitespace or check_exception_keyword: for path in _python_files(paths): with open(path) as f: file_contents = f.read() @@ -212,9 +210,7 @@ def stylistic_issues(paths, check_two_space_indents = False, check_newlines = Fa if '"""' in content: is_block_comment = not is_block_comment - if check_two_space_indents and '\t' in whitespace: - issues.setdefault(path, []).append(Issue(index + 1, 'indentation has a tab', line)) - elif check_newlines and '\r' in content: + if check_newlines and '\r' in content: issues.setdefault(path, []).append(Issue(index + 1, 'contains a windows newline', line)) elif check_trailing_whitespace and content != content.rstrip(): issues.setdefault(path, []).append(Issue(index + 1, 'line has trailing whitespace', line))

1 0

[stem/master] Fix the format of PEP8 issue lines.
by atagar＠torproject.org 08 Jul '15

08 Jul '15

commit c8cd4fc7f17c239384b1985ae8ae9370367ca394 Author: cypherpunks <cypherpunks(a)torproject.org> Date: Tue Jul 7 15:35:07 2015 +0200 Fix the format of PEP8 issue lines. According to commit d14c2803eca669022a64a5caf16699ce77e2fb70, an issue line consists of three elements; the line number, the error message and the actual line from the file that has the error. This commit fixes PEP8 issue lines where the error message and line were equal. Additionally, this commit removes the duplicate error code in PEP8 issue lines and adds parentheses around the line to improve readability. --- run_tests.py | 2 +- stem/util/test_tools.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/run_tests.py b/run_tests.py index d988900..47e977c 100755 --- a/run_tests.py +++ b/run_tests.py @@ -326,7 +326,7 @@ def _print_static_issues(static_check_issues): for line_number in sorted(line_to_issues.keys()): for msg, line in line_to_issues[line_number]: line_count = '%-4s' % line_number - println(' line %s - %-40s %s' % (line_count, msg, line.strip())) + println(' line %s - %-40s (%s)' % (line_count, msg, line.strip())) println() diff --git a/stem/util/test_tools.py b/stem/util/test_tools.py index d6a81c4..af9c944 100644 --- a/stem/util/test_tools.py +++ b/stem/util/test_tools.py @@ -188,7 +188,8 @@ def stylistic_issues(paths, check_two_space_indents = False, check_newlines = Fa code = super(StyleReport, self).error(line_number, offset, text, check) if code: - issues.setdefault(self.filename, []).append(Issue(line_number, '%s %s' % (code, text), text)) + line = linecache.getline(self.filename, line_number) + issues.setdefault(self.filename, []).append(Issue(line_number, text, line)) style_checker = pep8.StyleGuide(ignore = CONFIG['pep8.ignore'], reporter = StyleReport) style_checker.check_files(list(_python_files(paths)))

1 0