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

[tor/master] Merge branch 'maint-0.3.1'
by nickm＠torproject.org 03 Jul '17

03 Jul '17

commit 2778032f4a0b65429c5279db003fd5b354115d1b Merge: 0fe7c42 d011126 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 3 13:26:38 2017 -0400 Merge branch 'maint-0.3.1' scripts/codegen/fuzzing_include_am.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)

1 0

[tor/release-0.3.1] Update fuzzing_include_am to include updates from include.am
by nickm＠torproject.org 03 Jul '17

03 Jul '17

commit d0111264678704d0c2394a4ddd28621d3ef23d97 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 3 13:24:57 2017 -0400 Update fuzzing_include_am to include updates from include.am --- scripts/codegen/fuzzing_include_am.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/scripts/codegen/fuzzing_include_am.py b/scripts/codegen/fuzzing_include_am.py index 91e9e5f..6e45c21 100755 --- a/scripts/codegen/fuzzing_include_am.py +++ b/scripts/codegen/fuzzing_include_am.py @@ -1,4 +1,4 @@ - +#!/usr/bin/python FUZZERS = """ consensus @@ -33,7 +33,10 @@ FUZZING_LIBS = \ @TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ \ @TOR_LIBEVENT_LIBS@ \ @TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@ \ - @TOR_SYSTEMD_LIBS@ + @TOR_SYSTEMD_LIBS@ \ + @TOR_LZMA_LIBS@ \ + @TOR_ZSTD_LIBS@ \ + $(rust_ldadd) oss-fuzz-prereqs: \ src/or/libtor-testing.a \ @@ -48,7 +51,7 @@ oss-fuzz-prereqs: \ noinst_HEADERS += \ src/test/fuzz/fuzzing.h -LIBFUZZER = /home/nickm/build/libfuzz/libFuzzer.a +LIBFUZZER = -lFuzzer LIBFUZZER_CPPFLAGS = $(FUZZING_CPPFLAGS) -DLLVM_FUZZ LIBFUZZER_CFLAGS = $(FUZZING_CFLAGS) LIBFUZZER_LDFLAG = $(FUZZING_LDFLAG)

1 0

[metrics-lib/master] Avoid non-ASCII characters in expected messages.
by karsten＠torproject.org 03 Jul '17

03 Jul '17

commit 8678345af9922ca4431b084d75419961dac562fa Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Jul 3 15:35:39 2017 +0200 Avoid non-ASCII characters in expected messages. This currently breaks Jenkins build, which is not exactly our fault but Jenkin's. But this is test code, so it's easier to just adapt. --- .../torproject/descriptor/impl/ExtraInfoDescriptorImplTest.java | 5 +++-- .../org/torproject/descriptor/impl/ServerDescriptorImplTest.java | 7 ++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/test/java/org/torproject/descriptor/impl/ExtraInfoDescriptorImplTest.java b/src/test/java/org/torproject/descriptor/impl/ExtraInfoDescriptorImplTest.java index 9633f2b..5a3f0f2 100644 --- a/src/test/java/org/torproject/descriptor/impl/ExtraInfoDescriptorImplTest.java +++ b/src/test/java/org/torproject/descriptor/impl/ExtraInfoDescriptorImplTest.java @@ -1879,8 +1879,9 @@ public class ExtraInfoDescriptorImplTest { public void testBridgeIpsNonAsciiKeyword() throws DescriptorParseException { this.thrown.expect(DescriptorParseException.class); - this.thrown.expectMessage("Unrecognized character in keyword " - + "'�bridge-ips' in line '�bridge-ips'."); + this.thrown.expectMessage(Matchers.allOf( + Matchers.containsString("Unrecognized character in keyword "), + Matchers.containsString("bridge-ips'"))); DescriptorBuilder.createWithNonAsciiLineBytes(new byte[] { 0x14, (byte) 0xfe, 0x18, // non-ascii chars 0x62, 0x72, 0x69, 0x64, 0x67, 0x65, 0x2d, // "bridge-" diff --git a/src/test/java/org/torproject/descriptor/impl/ServerDescriptorImplTest.java b/src/test/java/org/torproject/descriptor/impl/ServerDescriptorImplTest.java index 534cb0e..e814b4c 100644 --- a/src/test/java/org/torproject/descriptor/impl/ServerDescriptorImplTest.java +++ b/src/test/java/org/torproject/descriptor/impl/ServerDescriptorImplTest.java @@ -14,6 +14,7 @@ import org.torproject.descriptor.BridgeServerDescriptor; import org.torproject.descriptor.DescriptorParseException; import org.torproject.descriptor.ServerDescriptor; +import org.hamcrest.Matchers; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; @@ -1549,9 +1550,9 @@ public class ServerDescriptorImplTest { public void testAllowSingleHopExitsNonAsciiKeyword() throws DescriptorParseException { this.thrown.expect(DescriptorParseException.class); - this.thrown.expectMessage("Unrecognized character in keyword " - + "'�allow-single-hop-exits' in line " - + "'�allow-single-hop-exits'."); + this.thrown.expectMessage(Matchers.allOf( + Matchers.containsString("Unrecognized character in keyword "), + Matchers.containsString("allow-single-hop-exits'"))); DescriptorBuilder.createWithNonAsciiLineBytes(new byte[] { 0x14, (byte) 0xfe, 0x18, // non-ascii chars 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x2d, // "allow-"

1 0

[metrics-lib/master] Update to Debian stretch libraries.
by karsten＠torproject.org 03 Jul '17

03 Jul '17

commit 0da6953cdd3811a737508afe160c7efd41465747 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Jul 3 11:17:41 2017 +0200 Update to Debian stretch libraries. --- CHANGELOG.md | 8 ++++++++ build.xml | 8 ++++---- src/build | 2 +- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c6543f2..1b27d12 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,11 @@ +# Changes in version 2.?.? - 2017-??-?? + + * Major changes + - Update dependencies to versions available in Debian stretch: + Apache Commons Compress 1.13, Apache Commons Lang 3.5, Google + Gson 2.4, JUnit 4.12, Logback 1.1.9, SLF4J 1.7.22, and XZ 1.6. + + # Changes in version 2.0.0 - 2017-06-28 * Major changes diff --git a/build.xml b/build.xml index eaaa5ae..0eba3ff 100644 --- a/build.xml +++ b/build.xml @@ -14,10 +14,10 @@ <property name="jarpatternprop" value="empty" /> <patternset id="runtime" > - <include name="commons-compress-1.9.jar"/> - <include name="gson-2.2.4.jar"/> - <include name="slf4j-api-1.7.7.jar" /> - <include name="xz-1.5.jar"/> + <include name="commons-compress-1.13.jar"/> + <include name="gson-2.4.jar"/> + <include name="slf4j-api-1.7.22.jar" /> + <include name="xz-1.6.jar"/> </patternset> <target name="coverage-check"> diff --git a/src/build b/src/build index e130139..b491c84 160000 --- a/src/build +++ b/src/build @@ -1 +1 @@ -Subproject commit e130139e1a551bcf3e6437a85799590600f4b096 +Subproject commit b491c845ab81027d2f29fe541f8303ff151d3d0b

1 0

[metrics-base/master] Update to Debian stretch libraries.
by karsten＠torproject.org 03 Jul '17

03 Jul '17

commit b491c845ab81027d2f29fe541f8303ff151d3d0b Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Jul 3 11:15:16 2017 +0200 Update to Debian stretch libraries. Note that Checkstyle and Cobertura are excluded from this update, because they're not required for the build and because we're still using newer versions than what's in stretch. We could attempt to downgrade and see if the versions in stretch are new enough. But that's not part of this patch. --- java/base.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/java/base.xml b/java/base.xml index 951dae5..4793d7b 100644 --- a/java/base.xml +++ b/java/base.xml @@ -48,10 +48,10 @@ <patternset refid="runtime" /> </fileset> <fileset dir="${libs}"> - <include name="junit4-4.11.jar"/> + <include name="junit4-4.12.jar"/> <include name="hamcrest-all-1.3.jar"/> - <include name="logback-core-1.1.2.jar" /> - <include name="logback-classic-1.1.2.jar" /> + <include name="logback-core-1.1.9.jar" /> + <include name="logback-classic-1.1.9.jar" /> </fileset> </path> @@ -64,16 +64,16 @@ <path id="cobertura.classpath"> <fileset dir="${libs}"> <include name="cobertura-2.1.1.jar" /> - <include name="slf4j-api-1.7.7.jar" /> - <include name="commons-lang3-3.3.2.jar" /> + <include name="slf4j-api-1.7.22.jar" /> + <include name="commons-lang3-3.5.jar" /> <include name="asm4-5.0.3.jar" /> <include name="asm4-util-5.0.3.jar" /> <include name="asm4-tree-5.0.3.jar" /> <include name="asm4-commons-5.0.3.jar" /> <include name="asm4-analysis-5.0.3.jar" /> <include name="oro-2.0.8.jar" /> - <include name="logback-core-1.1.2.jar" /> - <include name="logback-classic-1.1.2.jar" /> + <include name="logback-core-1.1.9.jar" /> + <include name="logback-classic-1.1.9.jar" /> </fileset> </path>

1 0

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 03 Jul '17

03 Jul '17

commit 076bb73b7cc80c6dc3457f0e1f8fa3d620ac3999 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jul 3 09:15:29 2017 +0000 Update translations for liveusb-creator --- vi/vi.po | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/vi/vi.po b/vi/vi.po index 549c6b1..98476f8 100644 --- a/vi/vi.po +++ b/vi/vi.po @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-06-30 13:14+0200\n" -"PO-Revision-Date: 2017-07-02 07:34+0000\n" +"PO-Revision-Date: 2017-07-03 09:02+0000\n" "Last-Translator: Acooldude\n" "Language-Team: Vietnamese (http://www.transifex.com/otf/torproject/language/vi/)\n" "MIME-Version: 1.0\n" @@ -343,7 +343,7 @@ msgid "" "The USB stick \"%(pretty_name)s\" is configured as non-removable by its " "manufacturer and Tails will fail to start on it. Please try installing on a " "different model." -msgstr "" +msgstr "Thẻ USB %(pretty_name)s được cấu hình không thể di rời bởi nhà sản xuất và Tails sẽ không khởi động được. Hãy thử cài đặt lên một mẫu USB khác." #: ../tails_installer/gui.py:498 #, python-format @@ -354,7 +354,7 @@ msgstr "Thiết bị \"%(pretty_name)s\" quá nhỏ để cài đặt Tails (yê #: ../tails_installer/gui.py:511 msgid "\"Install by cloning\"" -msgstr "" +msgstr "\"Cài đặt bằng cách nhân bản\"" #: ../tails_installer/gui.py:513 msgid "\"Install from ISO\"" @@ -370,7 +370,7 @@ msgstr "Không thể nâng cấp thiết bị %(pretty_name)s bởi vì nó khô #: ../tails_installer/gui.py:533 msgid "An error happened while installing Tails" -msgstr "" +msgstr "Một lỗi đã xuất hiện trong khi cài đặt Tails" #: ../tails_installer/gui.py:545 msgid "Refreshing releases..." @@ -386,7 +386,7 @@ msgstr "Cài đặt hoàn tất!" #: ../tails_installer/gui.py:590 msgid "Installation was completed." -msgstr "" +msgstr "Việc cài đặt đã được hoàn tất." #: ../tails_installer/gui.py:635 msgid "Unable to mount device" @@ -442,7 +442,7 @@ msgstr "%(filename)s được chọn" #: ../tails_installer/source.py:28 msgid "Unable to find LiveOS on ISO" -msgstr "" +msgstr "Không tìm thấy Hệ điều hành Trực tiếp (LiveOS) trên ảnh ISO" #: ../tails_installer/source.py:34 #, python-format @@ -455,29 +455,29 @@ msgid "" "There was a problem executing `%s`.\n" "%s\n" "%s" -msgstr "" +msgstr "Đã có một vấn đề khi thực hiện `%s`.\n%s\n%s" #: ../tails_installer/source.py:63 #, python-format msgid "'%s' does not exist" -msgstr "" +msgstr "'%s' không tồn tại " #: ../tails_installer/source.py:65 #, python-format msgid "'%s' is not a directory" -msgstr "" +msgstr "'%skhông phải là một thư mục' " #: ../tails_installer/source.py:75 #, python-format msgid "Skipping '%(filename)s'" -msgstr "" +msgstr "Bỏ qua '%(filename)s'" #: ../tails_installer/utils.py:44 #, python-format msgid "" "There was a problem executing `%s`.%s\n" "%s" -msgstr "" +msgstr "Đã có một vấn đề khi thực hiện `%s`.%s\n%s" #: ../tails_installer/utils.py:119 msgid "Could not open device for writing."

1 0

[webwml/master] Update README regarding how to minify files
by hiro＠torproject.org 03 Jul '17

03 Jul '17

commit a8e2b644366845a1db268858b25130197bc6d248 Author: hiromipaw <hiro(a)torproject.org> Date: Mon Jul 3 10:56:28 2017 +0200 Update README regarding how to minify files --- README.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 029b1b2..1d29e19 100644 --- a/README.md +++ b/README.md @@ -77,7 +77,11 @@ repository. ### Some information regarding working with minified CSS and JS sources -If you want to edit any of the CSS or JS sources, please bear in mind that the HTML uses the minified versions. We keep in the repository both versions side-to-side. Once you edit the original source make sure you generate the minified version again. Most editors have plugins to minify CSS and JS files. +If you want to edit any of the CSS or JS sources, please bear in mind that the HTML uses the minified versions. We keep in the repository both versions side-to-side. Once you edit the original source make sure you generate the minified version again. Most editors have plugins to minify CSS and JS files. On Debian it is possible to install the yui-compressor package and use it as follows: + + + yui-compressor myfile.js -o myfile-min.js + If you are wondering why is it "cool" to minify sources even though compression is used on the server, please consider that Minification can be well be used in combination with gzipping sources. Minification does a lot of additional things that compression doesn't do. During minification comments are removed, long variables are renamed to shorter variable names, etc. Transferred data can be significantly smaller after minification, than by simply compressing the original. Although this depends a lot on the original source, minifying helps with mobile browsers and slower connections.

1 0

[webwml/master] Remove text from jobs page
by hiro＠torproject.org 03 Jul '17

03 Jul '17

commit 14e3b1d8245aeb92fcd3c8ce9f884cf60a5b6383 Author: hiromipaw <hiro(a)torproject.org> Date: Thu Jun 22 11:10:41 2017 +0200 Remove text from jobs page --- about/en/jobs.wml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/about/en/jobs.wml b/about/en/jobs.wml index 37b1527..d455694 100644 --- a/about/en/jobs.wml +++ b/about/en/jobs.wml @@ -12,9 +12,9 @@ <div id="maincol"> <h1>The Tor Project is always looking for more great people to join our team!</h1> - <p>At the moment, we don't have any official open positions. Please check back - soon, though! In the meantime, you may want to glance at our - <a href="<page getinvolved/volunteer>">volunteers</a> page.</p> + #<p>At the moment, we don't have any official open positions. Please check back + # soon, though! In the meantime, you may want to glance at our + #<a href="<page getinvolved/volunteer>">volunteers</a> page.</p> <p>Specifically, we're looking for the following people currently:</p> <ul>

1 0

[webwml/master] Test styling 404 page
by hiro＠torproject.org 03 Jul '17

03 Jul '17

commit 8955eca0f97eaf373744ebd3723d5c7362fbe1a6 Author: hiromipaw <hiro(a)torproject.org> Date: Sat Jul 1 10:28:49 2017 +0200 Test styling 404 page --- en/404.wml | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 54 insertions(+), 1 deletion(-) diff --git a/en/404.wml b/en/404.wml index d96e217..0f396e7 100644 --- a/en/404.wml +++ b/en/404.wml @@ -1 +1,54 @@ -<p>This is an error page. Not sure how you got here.</p> +<!DOCTYPE html> + <html> + <head> + + <meta charset="utf-8"> + <meta http-equiv="X-UA-Compatible" content="IE=edge"> + <meta name="viewport" content="width=device-width, initial-scale=1"> + <meta name="author" content="The Tor Project, Inc."> + <meta name="description" content="The Tor Project's free software protects your privacy online. Site blocked? Email [mailto:gettor@torproject.org] for help downloading Tor Browser."> + <meta name="keywords" content="tor, tor project, tor browser, avoid censorship, traffic analysis, anonymous communications, privacy, avoid surveillance, online security, anonymous online, private browsing, anonymity online, online privacy, protect privacy, private mac browser, private windows browser, private android browser, linux browser, anonymity network, tor network, onion router, onion browser"> + <meta property="og:image" content="https://www.torproject.org/images/tor-logo.jpg"> +{#meta#} + + <title>$(TITLE)</title> + + <link rel="icon" href="$(IMGROOT)/favicon.ico"> + <ifneq "$(REDIRECT)" "" "<meta http-equiv="refresh" content="0;url=$(DOCROOT)/$(REDIRECT)">"> + <ifneq "$(REDIRECT_GLOBAL)" "" "<meta http-equiv="refresh" content="0;url=$(REDIRECT_GLOBAL)">"> + + # begin WML to generate css/js paths + <ifneq "$(STYLESHEET)" "" "<link href="$(DOCROOT)/$(STYLESHEET)" rel="stylesheet">"> + <ifeq "$(STYLESHEET)" "" "<link href="$(DOCROOT)/css/master.css" rel="stylesheet">"> + + #<link href="css/master.css" rel="stylesheet"> +  +  +  + # <script language="javascript" type="text/javascript" src="$(DOCROOT)/global.js"></script> + # end WML to generate css/js paths +</head> +<body> +<div id="wrap"> + <div id="header"> + <h1 id="logo"><a href="<page index>">Tor</a></h1> + </div> +</div> +<p>The requested URL was not found at this server.</p> +<div id="banner"> + + <p class="desc">Are you looking to download Tor and ended up here instead?</p> + +<div id="download"> +<a href="<page download/download-easy>"> + <span class="download-tor">Download Tor</span></a> +</div> +</div> +</body> +</html>

1 0

[webwml/master] Merge branch 'master' of ssh://git-rw.torproject.org/project/web/webwml into staging
by hiro＠torproject.org 03 Jul '17

03 Jul '17

commit 682e105973f7ef3e74512d1eedb101ece4fdcf48 Merge: d4f2145 98f29cb Author: hiromipaw <hiro(a)torproject.org> Date: Sat Jul 1 09:57:11 2017 +0200 Merge branch 'master' of ssh://git-rw.torproject.org/project/web/webwml into staging Makefile | 4 ++-- include/versions.wmi | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)

1 0