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

[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

[tor/release-0.4.2] 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.1' into release-0.4.1
by teor＠torproject.org 11 Nov '19

11 Nov '19

commit 06bbcbe45bc084e01746a37bab4fa9c19ae91786 Merge: fd31468ea 7043be968 Author: teor <teor(a)torproject.org> Date: Mon Nov 11 14:19:51 2019 +1000 Merge branch 'maint-0.4.1' into release-0.4.1 .appveyor.yml | 2 +- changes/bug32449 | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-)

1 0

[tor/release-0.4.1] 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.2] 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.2] Merge branch 'maint-0.4.1' into maint-0.4.2
by teor＠torproject.org 11 Nov '19

11 Nov '19

commit 8b1f99c29d6bcdbd3598b835b7084cee30383d01 Merge: 1f3bf10d3 7043be968 Author: teor <teor(a)torproject.org> Date: Mon Nov 11 14:19:55 2019 +1000 Merge branch 'maint-0.4.1' into maint-0.4.2 .appveyor.yml | 2 +- changes/bug32449 | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-)

1 0

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

11 Nov '19

commit 253a45115ef7908804f58df1020c6a6f46b3affa Merge: 7a4069911 8b1f99c29 Author: teor <teor(a)torproject.org> Date: Mon Nov 11 14:19:59 2019 +1000 Merge branch 'maint-0.4.2' into release-0.4.2 .appveyor.yml | 2 +- changes/bug32449 | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-)

1 0

[tor/release-0.4.2] 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

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

11 Nov '19

commit 8b1f99c29d6bcdbd3598b835b7084cee30383d01 Merge: 1f3bf10d3 7043be968 Author: teor <teor(a)torproject.org> Date: Mon Nov 11 14:19:55 2019 +1000 Merge branch 'maint-0.4.1' into maint-0.4.2 .appveyor.yml | 2 +- changes/bug32449 | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.4.2] 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