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

[tor/master] Merge branch 'maint-0.2.9' into maint-0.3.0
by nickm＠torproject.org 17 Feb '17

17 Feb '17

commit 5dbbd6bc392892df63a02cf601f94fa1fae6ebfc Merge: 3336f26 67cec75 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Feb 17 11:32:45 2017 -0500 Merge branch 'maint-0.2.9' into maint-0.3.0 src/or/routerparse.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor/maint-0.3.0] Check for micro < 0, rather than checking "minor" twice.
by nickm＠torproject.org 17 Feb '17

17 Feb '17

commit 67cec7578cab40ce43b54d4dfc1370894b91d28f Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Feb 17 11:31:39 2017 -0500 Check for micro < 0, rather than checking "minor" twice. Bug found with clang scan-build. Fixes bug on f63e06d3dc6757d. Bug not present in any released Tor. --- src/or/routerparse.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/routerparse.c b/src/or/routerparse.c index 7d9769b..2ee0d27 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -5551,7 +5551,7 @@ tor_version_parse_platform(const char *platform, if (strict) { if (router_version->major < 0 || router_version->minor < 0 || - router_version->minor < 0 || + router_version->micro < 0 || router_version->patchlevel < 0 || router_version->svn_revision < 0) { return -1;

1 0

[tor/release-0.2.9] Merge branch 'maint-0.2.9' into release-0.2.9
by nickm＠torproject.org 17 Feb '17

17 Feb '17

commit 3c74bc73fc9d801c590b1f8565d12a08e7ba4f2c Merge: 2e334d9 67cec75 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Feb 17 11:32:38 2017 -0500 Merge branch 'maint-0.2.9' into release-0.2.9 src/or/routerparse.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor/release-0.2.9] Check for micro < 0, rather than checking "minor" twice.
by nickm＠torproject.org 17 Feb '17

17 Feb '17

commit 67cec7578cab40ce43b54d4dfc1370894b91d28f Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Feb 17 11:31:39 2017 -0500 Check for micro < 0, rather than checking "minor" twice. Bug found with clang scan-build. Fixes bug on f63e06d3dc6757d. Bug not present in any released Tor. --- src/or/routerparse.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/routerparse.c b/src/or/routerparse.c index 7d9769b..2ee0d27 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -5551,7 +5551,7 @@ tor_version_parse_platform(const char *platform, if (strict) { if (router_version->major < 0 || router_version->minor < 0 || - router_version->minor < 0 || + router_version->micro < 0 || router_version->patchlevel < 0 || router_version->svn_revision < 0) { return -1;

1 0

[tor/release-0.3.0] Check for micro < 0, rather than checking "minor" twice.
by nickm＠torproject.org 17 Feb '17

17 Feb '17

commit 67cec7578cab40ce43b54d4dfc1370894b91d28f Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Feb 17 11:31:39 2017 -0500 Check for micro < 0, rather than checking "minor" twice. Bug found with clang scan-build. Fixes bug on f63e06d3dc6757d. Bug not present in any released Tor. --- src/or/routerparse.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/routerparse.c b/src/or/routerparse.c index 7d9769b..2ee0d27 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -5551,7 +5551,7 @@ tor_version_parse_platform(const char *platform, if (strict) { if (router_version->major < 0 || router_version->minor < 0 || - router_version->minor < 0 || + router_version->micro < 0 || router_version->patchlevel < 0 || router_version->svn_revision < 0) { return -1;

1 0

[tor/release-0.3.0] Merge branch 'maint-0.2.9' into maint-0.3.0
by nickm＠torproject.org 17 Feb '17

17 Feb '17

commit 5dbbd6bc392892df63a02cf601f94fa1fae6ebfc Merge: 3336f26 67cec75 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Feb 17 11:32:45 2017 -0500 Merge branch 'maint-0.2.9' into maint-0.3.0 src/or/routerparse.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor/master] Merge branch 'maint-0.3.0'
by nickm＠torproject.org 17 Feb '17

17 Feb '17

commit 9b1d99018bdc0a52e9342afa0cf812adcfa055db Merge: d3f0f10 5dbbd6b Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Feb 17 11:33:04 2017 -0500 Merge branch 'maint-0.3.0' src/or/routerparse.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor/maint-0.2.9] Check for micro < 0, rather than checking "minor" twice.
by nickm＠torproject.org 17 Feb '17

17 Feb '17

commit 67cec7578cab40ce43b54d4dfc1370894b91d28f Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Feb 17 11:31:39 2017 -0500 Check for micro < 0, rather than checking "minor" twice. Bug found with clang scan-build. Fixes bug on f63e06d3dc6757d. Bug not present in any released Tor. --- src/or/routerparse.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/routerparse.c b/src/or/routerparse.c index 7d9769b..2ee0d27 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -5551,7 +5551,7 @@ tor_version_parse_platform(const char *platform, if (strict) { if (router_version->major < 0 || router_version->minor < 0 || - router_version->minor < 0 || + router_version->micro < 0 || router_version->patchlevel < 0 || router_version->svn_revision < 0) { return -1;

1 0

[metrics-lib/master] Bump version to 1.6.0-dev.
by karsten＠torproject.org 17 Feb '17

17 Feb '17

commit 5b1db5d72b1d4de1eb5d41dda5aeac8ca5c69791 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Feb 17 16:45:13 2017 +0100 Bump version to 1.6.0-dev. --- build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.xml b/build.xml index 1522f12..fb926c2 100644 --- a/build.xml +++ b/build.xml @@ -6,7 +6,7 @@ <project default="usage" name="descriptor" basedir="."> - <property name="release.version" value="1.6.0" /> + <property name="release.version" value="1.6.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] Prepare metrics-lib for jenkins build. Exclude checks when building in jenkins. Add clean task as dep for test.
by karsten＠torproject.org 17 Feb '17

17 Feb '17

commit d154982e5a974bf451086241e79f9b3d9f56b2c6 Author: hiromipaw <silvia(a)nopressure.co.uk> Date: Wed Nov 9 16:48:55 2016 +0100 Prepare metrics-lib for jenkins build. Exclude checks when building in jenkins. Add clean task as dep for test. --- build.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.xml b/build.xml index 794188f..1c1cf6a 100644 --- a/build.xml +++ b/build.xml @@ -140,7 +140,7 @@ </javac> </target> - <target name="test" depends="compile,testcompile"> + <target name="test" depends="clean,compile,testcompile"> <junit fork="true" haltonfailure="true" printsummary="off"> <classpath refid="test.classpath"/> <formatter type="plain" usefile="false"/> @@ -162,7 +162,7 @@ <taskdef resource="com/puppycrawl/tools/checkstyle/ant/checkstyle-ant-task.properties"> <classpath refid="checkstyle.classpath" /> </taskdef> - <target name="checks" depends="compile"> + <target name="checks" depends="compile" unless="jenkins"> <checkstyle config="${testresources}/metrics_checks.xml"> <fileset dir="${sources}" includes="**/*.java" />

1 0