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

[tor/maint-0.2.5] Bump to 0.2.4.29
by nickm＠torproject.org 08 Jun '17

08 Jun '17

commit 8e439a66f3846b65a16b62936ad1d35dbf902e9d Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 8 09:25:31 2017 -0400 Bump to 0.2.4.29 --- configure.ac | 2 +- contrib/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 8e70722..6b4d009 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ dnl Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson dnl Copyright (c) 2007-2013, The Tor Project, Inc. dnl See LICENSE for licensing information -AC_INIT([tor],[0.2.4.28]) +AC_INIT([tor],[0.2.4.29]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4]) AM_INIT_AUTOMAKE diff --git a/contrib/tor-mingw.nsi.in b/contrib/tor-mingw.nsi.in index da24244..4e00cb7 100644 --- a/contrib/tor-mingw.nsi.in +++ b/contrib/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.2.4.28" +!define VERSION "0.2.4.29" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index cca8ad0..5468455 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -241,7 +241,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.2.4.28" +#define VERSION "0.2.4.29"

1 0

[tor/maint-0.2.6] Bump to 0.2.6.12
by nickm＠torproject.org 08 Jun '17

08 Jun '17

commit 0de46203750f8c01b5f355d743949fe8471b0636 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 8 09:26:20 2017 -0400 Bump to 0.2.6.12 --- configure.ac | 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index a79ea82..55e59e9 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ dnl Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson dnl Copyright (c) 2007-2015, The Tor Project, Inc. dnl See LICENSE for licensing information -AC_INIT([tor],[0.2.6.11]) +AC_INIT([tor],[0.2.6.12]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4]) AM_INIT_AUTOMAKE diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index 6611bb8..4de6b1b 100644 --- a/contrib/win32build/tor-mingw.nsi.in +++ b/contrib/win32build/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.2.6.11" +!define VERSION "0.2.6.12" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index 59cd43e..74a27f4 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -232,7 +232,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.2.6.11" +#define VERSION "0.2.6.12"

1 0

[tor/maint-0.2.6] Merge branch 'maint-0.2.4' into maint-0.2.5
by nickm＠torproject.org 08 Jun '17

08 Jun '17

commit 77c5d8c73856da7f07508fc263685717bd88dbc7 Merge: fa73f59 8e439a6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 8 09:28:11 2017 -0400 Merge branch 'maint-0.2.4' into maint-0.2.5 "ours" merge to avoid version bump.

1 0

[collector/master] Update to metrics-lib 1.8.1.
by karsten＠torproject.org 08 Jun '17

08 Jun '17

commit cfb682870d9c22ada81ffa2b6e2d39301cfe13dd Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Jun 8 16:04:56 2017 +0200 Update to metrics-lib 1.8.1. --- build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.xml b/build.xml index 929aff2..c7d8f95 100644 --- a/build.xml +++ b/build.xml @@ -11,7 +11,7 @@ <property name="release.version" value="1.1.2-dev" /> <property name="project-main-class" value="org.torproject.collector.Main" /> <property name="name" value="collector"/> - <property name="descriptorversion" value="1.8.0" /> + <property name="descriptorversion" value="1.8.1" /> <property name="jarincludes" value="collector.properties logback.xml" /> <patternset id="runtime" >

1 0

[metrics-lib/master] Bump version to 1.8.1-dev.
by karsten＠torproject.org 08 Jun '17

08 Jun '17

commit 569795e282abe2ea33a20289b77033ab7f2a0068 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Jun 8 16:00:34 2017 +0200 Bump version to 1.8.1-dev. --- CHANGELOG.md | 3 +++ build.xml | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 23259fc..44420bf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +# Changes in version 1.9.0 - 2017-06-?? + + # Changes in version 1.8.1 - 2017-06-08 * Medium changes diff --git a/build.xml b/build.xml index cc58705..1ed53ec 100644 --- a/build.xml +++ b/build.xml @@ -6,7 +6,7 @@ <project default="usage" name="descriptor" basedir="."> - <property name="release.version" value="1.8.1" /> + <property name="release.version" value="1.8.1-dev" /> <property name="javadoc-title" value="DescripTor API Documentation"/> <property name="javadoc-excludes" value="**/impl/** **/index/**" /> <property name="implementation-title" value="DescripTor" />

1 0

[metrics-lib/release] Bump version to 1.8.0-dev.
by karsten＠torproject.org 08 Jun '17

08 Jun '17

commit d739229ebc41c30b3db54c725f1e07e2985068f2 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Jun 7 09:07:48 2017 +0200 Bump version to 1.8.0-dev. --- CHANGELOG.md | 3 +++ build.xml | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f364b6a..2e08e97 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +# Changes in version 1.9.0 - 2017-06-?? + + # Changes in version 1.8.0 - 2017-06-07 * Medium changes diff --git a/build.xml b/build.xml index 89f249b..df1c36e 100644 --- a/build.xml +++ b/build.xml @@ -6,7 +6,7 @@ <project default="usage" name="descriptor" basedir="."> - <property name="release.version" value="1.8.0" /> + <property name="release.version" value="1.8.0-dev" /> <property name="javadoc-title" value="DescripTor API Documentation"/> <property name="javadoc-excludes" value="**/impl/** **/index/**" /> <property name="implementation-title" value="DescripTor" />

1 0

[metrics-lib/release] Implements fix discovered by karsten.
by karsten＠torproject.org 08 Jun '17

08 Jun '17

commit 352b71707122c0cf510235ed5bec08189a9d9ed5 Author: iwakeh <iwakeh(a)torproject.org> Date: Wed Jun 7 07:07:50 2017 +0000 Implements fix discovered by karsten. Implements task-22533. --- src/main/java/org/torproject/descriptor/impl/DescriptorParserImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/torproject/descriptor/impl/DescriptorParserImpl.java b/src/main/java/org/torproject/descriptor/impl/DescriptorParserImpl.java index 6db2883..6317597 100644 --- a/src/main/java/org/torproject/descriptor/impl/DescriptorParserImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/DescriptorParserImpl.java @@ -150,7 +150,7 @@ public class DescriptorParserImpl implements DescriptorParser { int startDescriptor; if (startAnnotations == ascii.indexOf(key.keyword + SP, startAnnotations) || startAnnotations == ascii.indexOf( - key.keyword + SP)) { + key.keyword + NL)) { startDescriptor = startAnnotations; } else { startDescriptor = ascii.indexOf(NL + key.keyword + SP,

1 0

[metrics-lib/release] Part of task-22533: failing test.
by karsten＠torproject.org 08 Jun '17

08 Jun '17

commit f18c6ef8b72e52e941a4a37532485ac7b80f5eef Author: iwakeh <iwakeh(a)torproject.org> Date: Wed Jun 7 07:07:49 2017 +0000 Part of task-22533: failing test. --- .../descriptor/impl/DescriptorImplTest.java | 10 ------ .../descriptor/impl/DescriptorParserImplTest.java | 41 ++++++++++++++++++++++ .../torproject/descriptor/impl/TestDescriptor.java | 17 +++++++++ 3 files changed, 58 insertions(+), 10 deletions(-) diff --git a/src/test/java/org/torproject/descriptor/impl/DescriptorImplTest.java b/src/test/java/org/torproject/descriptor/impl/DescriptorImplTest.java index cbe57ff..f1a8935 100644 --- a/src/test/java/org/torproject/descriptor/impl/DescriptorImplTest.java +++ b/src/test/java/org/torproject/descriptor/impl/DescriptorImplTest.java @@ -132,16 +132,6 @@ public class DescriptorImplTest { assertEquals("1bEECw9nT5KRzPG8dAzEFJgSI4OBQfyWn+wjREb8oa8", digest); } - class TestDescriptor extends DescriptorImpl { - - protected TestDescriptor(byte[] rawDescriptorBytes, int[] offsetAndLength, - boolean failUnrecognizedDescriptorLines, boolean blankLinesAllowed) - throws DescriptorParseException { - super(rawDescriptorBytes, offsetAndLength, - failUnrecognizedDescriptorLines, blankLinesAllowed); - } - } - } diff --git a/src/test/java/org/torproject/descriptor/impl/DescriptorParserImplTest.java b/src/test/java/org/torproject/descriptor/impl/DescriptorParserImplTest.java new file mode 100644 index 0000000..ef21ce6 --- /dev/null +++ b/src/test/java/org/torproject/descriptor/impl/DescriptorParserImplTest.java @@ -0,0 +1,41 @@ +/* Copyright 2017 The Tor Project + * See LICENSE for licensing information */ + +package org.torproject.descriptor.impl; + +import static org.junit.Assert.assertEquals; + +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.ExpectedException; + +public class DescriptorParserImplTest { + + @Rule + public ExpectedException thrown = ExpectedException.none(); + + private TestDescriptor makeTestDesc(byte[] bytes) throws Exception { + return new TestDescriptor(bytes, new int[]{0, bytes.length}, false, false); + } + + private static final String MICRO = + "@type microdescriptor 1.0\n" + + "onion-key\n" + + "-----BEGIN RSA PUBLIC KEY-----\n" + + "MIGJAoGBALzJLYYlkTv6tPet3vusug9judCTrN6MzthV1xVGMSuuWtGHhOJDaIPG\n" + + "hKdp99CAIU3sLXYO6zDQRF8PL/Z1GK3c+QHuotzfHotR7fMGtUQWNZRs9glVrVdj\n" + + "6KGAHFHo+9qs6NPg7Ux8Minw3wuaHCqoFbQVXo8F+S3wJE6YQ37HAgMBAAE=\n" + + "-----END RSA PUBLIC KEY-----\n" + + "ntor-onion-key RYjTCjtZRvOyfatfubhOjcEib/yDMsyJcjPT82mf6VA=\n" + + "id ed25519 ihsbrlWToq8b01rvfszqqTMUl2ulyPV3TniKuTENCzY\n"; + + @Test + public void testAnnotation() throws Exception { + TestDescriptor des = makeTestDesc(MICRO.getBytes()); + DescriptorParserImpl dpi = new DescriptorParserImpl(); + assertEquals(1, + dpi.parseDescriptors(des.getRawDescriptorBytes(), "dummy.file").size()); + } + +} + diff --git a/src/test/java/org/torproject/descriptor/impl/TestDescriptor.java b/src/test/java/org/torproject/descriptor/impl/TestDescriptor.java new file mode 100644 index 0000000..84aedee --- /dev/null +++ b/src/test/java/org/torproject/descriptor/impl/TestDescriptor.java @@ -0,0 +1,17 @@ +/* Copyright 2017 The Tor Project + * See LICENSE for licensing information */ + +package org.torproject.descriptor.impl; + +public class TestDescriptor extends DescriptorImpl { + + protected TestDescriptor(byte[] rawDescriptorBytes, int[] offsetAndLength, + boolean failUnrecognizedDescriptorLines, boolean blankLinesAllowed) + throws DescriptorParseException { + super(rawDescriptorBytes, offsetAndLength, + failUnrecognizedDescriptorLines, blankLinesAllowed); + } +} + + +

1 0

[metrics-lib/release] Prepare for 1.8.1 release.
by karsten＠torproject.org 08 Jun '17

08 Jun '17

commit e0e5d87aacd9f70c23262b7ee10e3e51ec0ae577 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Jun 8 09:43:53 2017 +0200 Prepare for 1.8.1 release. --- CHANGELOG.md | 6 +++++- build.xml | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2e08e97..23259fc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,8 @@ -# Changes in version 1.9.0 - 2017-06-?? +# Changes in version 1.8.1 - 2017-06-08 + + * Medium changes + - Fix a regression in parsing microdescriptors and version 1 + directories introduced in 1.8.0. # Changes in version 1.8.0 - 2017-06-07 diff --git a/build.xml b/build.xml index df1c36e..cc58705 100644 --- a/build.xml +++ b/build.xml @@ -6,7 +6,7 @@ <project default="usage" name="descriptor" basedir="."> - <property name="release.version" value="1.8.0-dev" /> + <property name="release.version" value="1.8.1" /> <property name="javadoc-title" value="DescripTor API Documentation"/> <property name="javadoc-excludes" value="**/impl/** **/index/**" /> <property name="implementation-title" value="DescripTor" />

1 0

[metrics-lib/master] Implements fix discovered by karsten.
by karsten＠torproject.org 08 Jun '17

08 Jun '17

commit 352b71707122c0cf510235ed5bec08189a9d9ed5 Author: iwakeh <iwakeh(a)torproject.org> Date: Wed Jun 7 07:07:50 2017 +0000 Implements fix discovered by karsten. Implements task-22533. --- src/main/java/org/torproject/descriptor/impl/DescriptorParserImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/torproject/descriptor/impl/DescriptorParserImpl.java b/src/main/java/org/torproject/descriptor/impl/DescriptorParserImpl.java index 6db2883..6317597 100644 --- a/src/main/java/org/torproject/descriptor/impl/DescriptorParserImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/DescriptorParserImpl.java @@ -150,7 +150,7 @@ public class DescriptorParserImpl implements DescriptorParser { int startDescriptor; if (startAnnotations == ascii.indexOf(key.keyword + SP, startAnnotations) || startAnnotations == ascii.indexOf( - key.keyword + SP)) { + key.keyword + NL)) { startDescriptor = startAnnotations; } else { startDescriptor = ascii.indexOf(NL + key.keyword + SP,

1 0