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

[collector/master] Prepare for 1.3.0 release.
by karsten＠torproject.org 15 Sep '17

15 Sep '17

commit 18006f9561f4ad03a1fae35b580ff66222296519 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Sep 15 11:36:04 2017 +0200 Prepare for 1.3.0 release. --- CHANGELOG.md | 2 +- build.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7d70bbd..fb94bd8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -# Changes in version 1.?.? - 2017-??-?? +# Changes in version 1.3.0 - 2017-09-15 * Major changes - Update to metrics-lib 2.1.0 and to Java 8. diff --git a/build.xml b/build.xml index 3e162f0..9ebac4a 100644 --- a/build.xml +++ b/build.xml @@ -8,7 +8,7 @@ <property name="javadoc-title" value="CollecTor API Documentation"/> <property name="implementation-title" value="CollecTor" /> - <property name="release.version" value="1.2.1-dev" /> + <property name="release.version" value="1.3.0" /> <property name="project-main-class" value="org.torproject.collector.Main" /> <property name="name" value="collector"/> <property name="metricslibversion" value="2.1.0" />

1 0

[collector/master] Bump version to 1.3.0-dev.
by karsten＠torproject.org 15 Sep '17

15 Sep '17

commit 1d2e2479b3321ee68cb8a7f20a9430b384653058 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Sep 15 16:08:43 2017 +0200 Bump version to 1.3.0-dev. --- build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.xml b/build.xml index 9ebac4a..943c717 100644 --- a/build.xml +++ b/build.xml @@ -8,7 +8,7 @@ <property name="javadoc-title" value="CollecTor API Documentation"/> <property name="implementation-title" value="CollecTor" /> - <property name="release.version" value="1.3.0" /> + <property name="release.version" value="1.3.0-dev" /> <property name="project-main-class" value="org.torproject.collector.Main" /> <property name="name" value="collector"/> <property name="metricslibversion" value="2.1.0" />

1 0

[metrics-lib/master] Bump version to 2.1.0-dev.
by karsten＠torproject.org 15 Sep '17

15 Sep '17

commit 6b8de66d171dd85d8244a7d326ca436ce68e0d78 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Sep 15 16:07:05 2017 +0200 Bump version to 2.1.0-dev. --- build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.xml b/build.xml index 6ad5a18..6f493fa 100644 --- a/build.xml +++ b/build.xml @@ -6,7 +6,7 @@ <project default="usage" name="metrics-lib" basedir="."> - <property name="release.version" value="2.1.0" /> + <property name="release.version" value="2.1.0-dev" /> <property name="javadoc-title" value="Tor Metrics Library API Documentation"/> <property name="javadoc-excludes" value="**/impl/** **/index/** **/internal/** **/log/**" /> <property name="implementation-title" value="Tor Metrics Library" />

1 0

[metrics-lib/master] Prepare for 2.1.0 release.
by karsten＠torproject.org 15 Sep '17

15 Sep '17

commit 27e1ff049781f8b7f80370e00462e3f061ef9c6f Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Sep 15 11:25:29 2017 +0200 Prepare for 2.1.0 release. --- CHANGELOG.md | 2 +- build.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cb314dc..2c40c10 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -# Changes in version 2.?.? - 2017-??-?? +# Changes in version 2.1.0 - 2017-09-15 * Major changes - Update dependencies to versions available in Debian stretch: diff --git a/build.xml b/build.xml index 832f29a..6ad5a18 100644 --- a/build.xml +++ b/build.xml @@ -6,7 +6,7 @@ <project default="usage" name="metrics-lib" basedir="."> - <property name="release.version" value="2.0.0-dev" /> + <property name="release.version" value="2.1.0" /> <property name="javadoc-title" value="Tor Metrics Library API Documentation"/> <property name="javadoc-excludes" value="**/impl/** **/index/** **/internal/** **/log/**" /> <property name="implementation-title" value="Tor Metrics Library" />

1 0

[metrics-lib/master] Update to Java 8.
by karsten＠torproject.org 15 Sep '17

15 Sep '17

commit 65c266a8f9fdf57d306d12d1d63a6cf624905f47 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Sep 15 11:20:43 2017 +0200 Update to Java 8. --- CHANGELOG.md | 1 + build.xml | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a294c62..cb314dc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ - 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. + - Update to Java 8. * Minor changes - Retain trailing newline in Torperf results. diff --git a/build.xml b/build.xml index 3d712a1..832f29a 100644 --- a/build.xml +++ b/build.xml @@ -12,7 +12,6 @@ <property name="implementation-title" value="Tor Metrics Library" /> <property name="name" value="metrics-lib" /> <property name="jarpatternprop" value="empty" /> - <property name="source-and-target-java-version" value="1.7" /> <patternset id="runtime" > <include name="commons-compress-1.13.jar"/>

1 0

[translation/bridgedb_completed] Update translations for bridgedb_completed
by translation＠torproject.org 15 Sep '17

15 Sep '17

commit 67d11c80a6b38cc5f3abfb4c6e8d017d188dafbd Author: Translation commit bot <translation(a)torproject.org> Date: Fri Sep 15 13:45:10 2017 +0000 Update translations for bridgedb_completed --- ru/LC_MESSAGES/bridgedb.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ru/LC_MESSAGES/bridgedb.po b/ru/LC_MESSAGES/bridgedb.po index fc09c8c38..925a9f50b 100644 --- a/ru/LC_MESSAGES/bridgedb.po +++ b/ru/LC_MESSAGES/bridgedb.po @@ -27,7 +27,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2017-09-11 09:43+0000\n" +"PO-Revision-Date: 2017-09-15 13:38+0000\n" "Last-Translator: Andrey\n" "Language-Team: Russian (http://www.transifex.com/otf/torproject/language/ru/)\n" "MIME-Version: 1.0\n"

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 15 Sep '17

15 Sep '17

commit b05a12a0dcbf89d1842a604b55e0aef5b21eb57a Author: Translation commit bot <translation(a)torproject.org> Date: Fri Sep 15 13:45:04 2017 +0000 Update translations for bridgedb --- ru/LC_MESSAGES/bridgedb.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ru/LC_MESSAGES/bridgedb.po b/ru/LC_MESSAGES/bridgedb.po index fc09c8c38..925a9f50b 100644 --- a/ru/LC_MESSAGES/bridgedb.po +++ b/ru/LC_MESSAGES/bridgedb.po @@ -27,7 +27,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2017-09-11 09:43+0000\n" +"PO-Revision-Date: 2017-09-15 13:38+0000\n" "Last-Translator: Andrey\n" "Language-Team: Russian (http://www.transifex.com/otf/torproject/language/ru/)\n" "MIME-Version: 1.0\n"

1 0

[tor/release-0.3.1] Merge branch 'maint-0.3.1' into release-0.3.1
by nickm＠torproject.org 15 Sep '17

15 Sep '17

commit d7eef61147d37b45eac53d422025a7ce64392af4 Merge: b05226f05 b440560b8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 15 09:34:06 2017 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 configure.ac | 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)

1 0

[tor/release-0.3.1] bump to 0.3.1.7
by nickm＠torproject.org 15 Sep '17

15 Sep '17

commit b440560b8bdd6034ddf94720bf9e3683aca68f72 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 15 09:33:32 2017 -0400 bump to 0.3.1.7 --- 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 8b13abdc4..9c6b14bf4 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2017, The Tor Project, Inc. dnl See LICENSE for licensing information AC_PREREQ([2.63]) -AC_INIT([tor],[0.3.1.6-rc-dev]) +AC_INIT([tor],[0.3.1.7]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4]) diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index ad21f72a2..7357ec685 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.3.1.6-rc-dev" +!define VERSION "0.3.1.7" !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 446406521..895d867d3 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -218,7 +218,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.3.1.6-rc-dev" +#define VERSION "0.3.1.7"

1 0

[tor/maint-0.3.1] bump to 0.3.1.7
by nickm＠torproject.org 15 Sep '17

15 Sep '17

commit b440560b8bdd6034ddf94720bf9e3683aca68f72 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 15 09:33:32 2017 -0400 bump to 0.3.1.7 --- 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 8b13abdc4..9c6b14bf4 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2017, The Tor Project, Inc. dnl See LICENSE for licensing information AC_PREREQ([2.63]) -AC_INIT([tor],[0.3.1.6-rc-dev]) +AC_INIT([tor],[0.3.1.7]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4]) diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index ad21f72a2..7357ec685 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.3.1.6-rc-dev" +!define VERSION "0.3.1.7" !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 446406521..895d867d3 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -218,7 +218,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.3.1.6-rc-dev" +#define VERSION "0.3.1.7"

1 0