November 2019 - tor-commits - lists.torproject.org

[collector/release] Bump version to 1.13.0-dev.
by karsten＠torproject.org 11 Nov '19

11 Nov '19

commit de8ab5f1e9ca1b0c995be6b858aad7ae3aa6f5cd Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sat Nov 9 11:35:02 2019 +0100 Bump version to 1.13.0-dev. --- CHANGELOG.md | 3 +++ build.xml | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4ac0b3c..2edc44d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +# Changes in version 1.1?.? - 2019-1?-?? + + # Changes in version 1.13.0 - 2019-11-09 * Medium changes diff --git a/build.xml b/build.xml index c1c8699..9c72447 100644 --- a/build.xml +++ b/build.xml @@ -9,7 +9,7 @@ <property name="javadoc-title" value="CollecTor API Documentation"/> <property name="implementation-title" value="CollecTor" /> - <property name="release.version" value="1.13.0" /> + <property name="release.version" value="1.13.0-dev" /> <property name="project-main-class" value="org.torproject.metrics.collector.Main" /> <property name="name" value="collector"/> <property name="metricslibversion" value="2.9.0" />

1 0

[collector/release] Prepare for 1.13.1 release.
by karsten＠torproject.org 11 Nov '19

11 Nov '19

commit 199d1bed2b337f769c3718c4473f2886e7ecfa06 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Nov 11 10:14:47 2019 +0100 Prepare for 1.13.1 release. --- CHANGELOG.md | 5 ++++- build.xml | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2edc44d..174f2e1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,7 @@ -# Changes in version 1.1?.? - 2019-1?-?? +# Changes in version 1.13.1 - 2019-11-11 + + * Minor changes + - Update to metrics-lib 2.9.1. # Changes in version 1.13.0 - 2019-11-09 diff --git a/build.xml b/build.xml index 9c72447..e91dae3 100644 --- a/build.xml +++ b/build.xml @@ -9,10 +9,10 @@ <property name="javadoc-title" value="CollecTor API Documentation"/> <property name="implementation-title" value="CollecTor" /> - <property name="release.version" value="1.13.0-dev" /> + <property name="release.version" value="1.13.1" /> <property name="project-main-class" value="org.torproject.metrics.collector.Main" /> <property name="name" value="collector"/> - <property name="metricslibversion" value="2.9.0" /> + <property name="metricslibversion" value="2.9.1" /> <property name="jarincludes" value="collector.properties logback.xml" /> <patternset id="runtime" >

1 0

[collector/master] Prepare for 1.13.1 release.
by karsten＠torproject.org 11 Nov '19

11 Nov '19

commit 199d1bed2b337f769c3718c4473f2886e7ecfa06 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Nov 11 10:14:47 2019 +0100 Prepare for 1.13.1 release. --- CHANGELOG.md | 5 ++++- build.xml | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2edc44d..174f2e1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,7 @@ -# Changes in version 1.1?.? - 2019-1?-?? +# Changes in version 1.13.1 - 2019-11-11 + + * Minor changes + - Update to metrics-lib 2.9.1. # Changes in version 1.13.0 - 2019-11-09 diff --git a/build.xml b/build.xml index 9c72447..e91dae3 100644 --- a/build.xml +++ b/build.xml @@ -9,10 +9,10 @@ <property name="javadoc-title" value="CollecTor API Documentation"/> <property name="implementation-title" value="CollecTor" /> - <property name="release.version" value="1.13.0-dev" /> + <property name="release.version" value="1.13.1" /> <property name="project-main-class" value="org.torproject.metrics.collector.Main" /> <property name="name" value="collector"/> - <property name="metricslibversion" value="2.9.0" /> + <property name="metricslibversion" value="2.9.1" /> <property name="jarincludes" value="collector.properties logback.xml" /> <patternset id="runtime" >

1 0

[tor/release-0.4.0] Merge branch 'maint-0.4.0' into release-0.4.0
by teor＠torproject.org 11 Nov '19

11 Nov '19

commit c0543ac327e63d092e96b5084dc4f3a4c7066050 Merge: e24152319 29940511e Author: teor <teor(a)torproject.org> Date: Mon Nov 11 14:19:43 2019 +1000 Merge branch 'maint-0.4.0' into release-0.4.0 .appveyor.yml | 2 +- changes/bug32449 | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-)

1 0

[tor/release-0.4.0] Appveyor: Install OpenSSL to resolve a header/library mismatch
by teor＠torproject.org 11 Nov '19

11 Nov '19

commit 2abff832ddccbd8c32778cf4dba73729666b83d9 Author: teor <teor(a)torproject.org> Date: Mon Nov 11 12:56:08 2019 +1000 Appveyor: Install OpenSSL to resolve a header/library mismatch Install the mingw OpenSSL package in Appveyor. This makes sure that the OpenSSL headers and libraries match in Tor's Appveyor builds. (This bug was triggered by an Appveyor image update.) Fixes bug 32449; bugfix on 0.3.5.6-rc. --- .appveyor.yml | 2 +- changes/bug32449 | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.appveyor.yml b/.appveyor.yml index f722478e1..818e074a4 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -62,7 +62,7 @@ install: # # Use pacman --debug to show package downloads and install locations #> - Execute-Command "C:\msys64\usr\bin\pacman" -Sy --verbose --needed --noconfirm ${env:mingw_prefix}-libevent ${env:mingw_prefix}-pkg-config ${env:mingw_prefix}-xz ${env:mingw_prefix}-zstd ; + Execute-Command "C:\msys64\usr\bin\pacman" -Sy --verbose --needed --noconfirm ${env:mingw_prefix}-libevent ${env:mingw_prefix}-openssl ${env:mingw_prefix}-pkg-config ${env:mingw_prefix}-xz ${env:mingw_prefix}-zstd ; build_script: - ps: >- diff --git a/changes/bug32449 b/changes/bug32449 new file mode 100644 index 000000000..213d8a101 --- /dev/null +++ b/changes/bug32449 @@ -0,0 +1,5 @@ + o Minor bugfixes (CI, appveyor): + - Install the mingw OpenSSL package in Appveyor. This makes sure that + the OpenSSL headers and libraries match in Tor's Appveyor builds. + (This bug was triggered by an Appveyor image update.) + Fixes bug 32449; bugfix on 0.3.5.6-rc.

1 0

[tor/release-0.3.5] Appveyor: Install OpenSSL to resolve a header/library mismatch
by teor＠torproject.org 11 Nov '19

11 Nov '19

commit 2abff832ddccbd8c32778cf4dba73729666b83d9 Author: teor <teor(a)torproject.org> Date: Mon Nov 11 12:56:08 2019 +1000 Appveyor: Install OpenSSL to resolve a header/library mismatch Install the mingw OpenSSL package in Appveyor. This makes sure that the OpenSSL headers and libraries match in Tor's Appveyor builds. (This bug was triggered by an Appveyor image update.) Fixes bug 32449; bugfix on 0.3.5.6-rc. --- .appveyor.yml | 2 +- changes/bug32449 | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.appveyor.yml b/.appveyor.yml index f722478e1..818e074a4 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -62,7 +62,7 @@ install: # # Use pacman --debug to show package downloads and install locations #> - Execute-Command "C:\msys64\usr\bin\pacman" -Sy --verbose --needed --noconfirm ${env:mingw_prefix}-libevent ${env:mingw_prefix}-pkg-config ${env:mingw_prefix}-xz ${env:mingw_prefix}-zstd ; + Execute-Command "C:\msys64\usr\bin\pacman" -Sy --verbose --needed --noconfirm ${env:mingw_prefix}-libevent ${env:mingw_prefix}-openssl ${env:mingw_prefix}-pkg-config ${env:mingw_prefix}-xz ${env:mingw_prefix}-zstd ; build_script: - ps: >- diff --git a/changes/bug32449 b/changes/bug32449 new file mode 100644 index 000000000..213d8a101 --- /dev/null +++ b/changes/bug32449 @@ -0,0 +1,5 @@ + o Minor bugfixes (CI, appveyor): + - Install the mingw OpenSSL package in Appveyor. This makes sure that + the OpenSSL headers and libraries match in Tor's Appveyor builds. + (This bug was triggered by an Appveyor image update.) + Fixes bug 32449; bugfix on 0.3.5.6-rc.

1 0

[tor/release-0.4.0] Merge branch 'maint-0.3.5' into maint-0.4.0
by teor＠torproject.org 11 Nov '19

11 Nov '19

commit 29940511e3c431a2c62a3844c6b12a039eaed521 Merge: 03e77ef03 2abff832d Author: teor <teor(a)torproject.org> Date: Mon Nov 11 14:19:39 2019 +1000 Merge branch 'maint-0.3.5' into maint-0.4.0 .appveyor.yml | 2 +- changes/bug32449 | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-)

1 0

[tor/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
by teor＠torproject.org 11 Nov '19

11 Nov '19

commit 58046be102dc94cdf38593e8f53b945762515751 Merge: 1fb110d3a 2abff832d Author: teor <teor(a)torproject.org> Date: Mon Nov 11 14:19:34 2019 +1000 Merge branch 'maint-0.3.5' into release-0.3.5 .appveyor.yml | 2 +- changes/bug32449 | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-)

1 0

[tor/release-0.4.1] Merge branch 'maint-0.3.5' into maint-0.4.0
by teor＠torproject.org 11 Nov '19

11 Nov '19

commit 29940511e3c431a2c62a3844c6b12a039eaed521 Merge: 03e77ef03 2abff832d Author: teor <teor(a)torproject.org> Date: Mon Nov 11 14:19:39 2019 +1000 Merge branch 'maint-0.3.5' into maint-0.4.0 .appveyor.yml | 2 +- changes/bug32449 | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-)

1 0

[tor/release-0.4.1] Merge branch 'maint-0.4.0' into maint-0.4.1
by teor＠torproject.org 11 Nov '19

11 Nov '19

commit 7043be968a6ebe6fe56f139fc8db372aa9a7379a Merge: de6ceb0be 29940511e Author: teor <teor(a)torproject.org> Date: Mon Nov 11 14:19:47 2019 +1000 Merge branch 'maint-0.4.0' into maint-0.4.1 .appveyor.yml | 2 +- changes/bug32449 | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-)

1 0