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

[tor/release-0.4.0] Merge branch 'maint-0.4.0' into release-0.4.0
by nickm＠torproject.org 07 Mar '19

07 Mar '19

commit 1128eec8368780db19666561bd3e9f2bbde88c11 Merge: 9152692b9 3af943dcd Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Mar 7 08:57:00 2019 -0500 Merge branch 'maint-0.4.0' into release-0.4.0 changes/bug29144 | 5 +++++ src/core/mainloop/connection.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)

1 0

[tor/release-0.4.0] Log the correct "auto" port number for listening sockets
by nickm＠torproject.org 07 Mar '19

07 Mar '19

commit 389ee834b6795ccabbe3d4c7edfdaf8d89696438 Author: Kris Katterjohn <katterjohn(a)gmail.com> Date: Mon Jan 21 13:12:53 2019 -0600 Log the correct "auto" port number for listening sockets When "auto" was used for the port number for a listening socket, the message logged after opening the socket would incorrectly say port 0 instead of the actual port used. Fixes bug 29144; bugfix on 0.3.5.1-alpha Signed-off-by: Kris Katterjohn <katterjohn(a)gmail.com> --- changes/bug29144 | 5 +++++ src/core/mainloop/connection.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/changes/bug29144 b/changes/bug29144 new file mode 100644 index 000000000..5801224f1 --- /dev/null +++ b/changes/bug29144 @@ -0,0 +1,5 @@ + o Minor bugfixes (logging): + - Log the correct port number for listening sockets when "auto" is + used to let Tor pick the port number. Previously, port 0 was + logged instead of the actual port number. Fixes bug 29144; + bugfix on 0.3.5.1-alpha. Patch from Kris Katterjohn. diff --git a/src/core/mainloop/connection.c b/src/core/mainloop/connection.c index f2a646c5f..7b8dc7f36 100644 --- a/src/core/mainloop/connection.c +++ b/src/core/mainloop/connection.c @@ -1527,7 +1527,7 @@ connection_listener_new(const struct sockaddr *listensockaddr, conn_type_to_string(type), conn->address); } else { log_notice(LD_NET, "Opened %s on %s", - conn_type_to_string(type), fmt_addrport(&addr, usePort)); + conn_type_to_string(type), fmt_addrport(&addr, gotPort)); } return conn;

1 0

[tor/release-0.4.0] Merge remote-tracking branch 'tor-github/pr/745' into maint-0.4.0
by nickm＠torproject.org 07 Mar '19

07 Mar '19

commit 3af943dcd19d5bdb8fba059e773b6795d4bf89f5 Merge: d8409ccb7 389ee834b Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Mar 7 08:56:35 2019 -0500 Merge remote-tracking branch 'tor-github/pr/745' into maint-0.4.0 changes/bug29144 | 5 +++++ src/core/mainloop/connection.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.4.0] Log the correct "auto" port number for listening sockets
by nickm＠torproject.org 07 Mar '19

07 Mar '19

commit 389ee834b6795ccabbe3d4c7edfdaf8d89696438 Author: Kris Katterjohn <katterjohn(a)gmail.com> Date: Mon Jan 21 13:12:53 2019 -0600 Log the correct "auto" port number for listening sockets When "auto" was used for the port number for a listening socket, the message logged after opening the socket would incorrectly say port 0 instead of the actual port used. Fixes bug 29144; bugfix on 0.3.5.1-alpha Signed-off-by: Kris Katterjohn <katterjohn(a)gmail.com> --- changes/bug29144 | 5 +++++ src/core/mainloop/connection.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/changes/bug29144 b/changes/bug29144 new file mode 100644 index 000000000..5801224f1 --- /dev/null +++ b/changes/bug29144 @@ -0,0 +1,5 @@ + o Minor bugfixes (logging): + - Log the correct port number for listening sockets when "auto" is + used to let Tor pick the port number. Previously, port 0 was + logged instead of the actual port number. Fixes bug 29144; + bugfix on 0.3.5.1-alpha. Patch from Kris Katterjohn. diff --git a/src/core/mainloop/connection.c b/src/core/mainloop/connection.c index f2a646c5f..7b8dc7f36 100644 --- a/src/core/mainloop/connection.c +++ b/src/core/mainloop/connection.c @@ -1527,7 +1527,7 @@ connection_listener_new(const struct sockaddr *listensockaddr, conn_type_to_string(type), conn->address); } else { log_notice(LD_NET, "Opened %s on %s", - conn_type_to_string(type), fmt_addrport(&addr, usePort)); + conn_type_to_string(type), fmt_addrport(&addr, gotPort)); } return conn;

1 0

[tor/maint-0.4.0] Merge remote-tracking branch 'tor-github/pr/745' into maint-0.4.0
by nickm＠torproject.org 07 Mar '19

07 Mar '19

commit 3af943dcd19d5bdb8fba059e773b6795d4bf89f5 Merge: d8409ccb7 389ee834b Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Mar 7 08:56:35 2019 -0500 Merge remote-tracking branch 'tor-github/pr/745' into maint-0.4.0 changes/bug29144 | 5 +++++ src/core/mainloop/connection.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.4.0] appveyor: Do the 64-bit Windows Server 2016 job first
by nickm＠torproject.org 07 Mar '19

07 Mar '19

commit 78bfe731c3320437901d3801f54ade66a93bd227 Author: teor <teor(a)torproject.org> Date: Thu Feb 28 07:40:15 2019 +1000 appveyor: Do the 64-bit Windows Server 2016 job first --- .appveyor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index da791faca..9913bf3bd 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -6,10 +6,10 @@ clone_depth: 50 # But we compile using MinGW, not Visual Studio. # We use these images because they have different Windows versions. image: - # Windows Server 2012 R2 - - Visual Studio 2015 # Windows Server 2016 - Visual Studio 2017 + # Windows Server 2012 R2 + - Visual Studio 2015 environment: compiler: mingw

1 0

[tor/maint-0.4.0] Merge remote-tracking branch 'tor-github/pr/733' into maint-0.4.0
by nickm＠torproject.org 07 Mar '19

07 Mar '19

commit d8409ccb76e1902e81f8f2c7d62babe64efd3e84 Merge: 9b4ecbaa7 78bfe731c Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Mar 7 08:34:15 2019 -0500 Merge remote-tracking branch 'tor-github/pr/733' into maint-0.4.0 .appveyor.yml | 23 +++++++++++++++++++++-- changes/bug29601 | 6 ++++++ 2 files changed, 27 insertions(+), 2 deletions(-)

1 0

[tor/master] appveyor: Do the 64-bit Windows Server 2016 job first
by nickm＠torproject.org 07 Mar '19

07 Mar '19

commit 78bfe731c3320437901d3801f54ade66a93bd227 Author: teor <teor(a)torproject.org> Date: Thu Feb 28 07:40:15 2019 +1000 appveyor: Do the 64-bit Windows Server 2016 job first --- .appveyor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index da791faca..9913bf3bd 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -6,10 +6,10 @@ clone_depth: 50 # But we compile using MinGW, not Visual Studio. # We use these images because they have different Windows versions. image: - # Windows Server 2012 R2 - - Visual Studio 2015 # Windows Server 2016 - Visual Studio 2017 + # Windows Server 2012 R2 + - Visual Studio 2015 environment: compiler: mingw

1 0

[tor/master] appveyor: skip two redundant builds to speed up CI on Windows
by nickm＠torproject.org 07 Mar '19

07 Mar '19

commit a479909ee8cd10b22d534e4c0855df4f8fb9807b Author: teor <teor(a)torproject.org> Date: Wed Feb 27 16:11:47 2019 +1000 appveyor: skip two redundant builds to speed up CI on Windows Skip the Appveyor 32-bit Windows Server 2016 job, and 64-bit Windows Server 2012 R2 job. The remaining 2 jobs still provide coverage of 64/32-bit, and Windows Server 2016/2012 R2. Also set fast_finish, so failed jobs terminate the build immediately. Fixes bug 29601; bugfix on 0.3.5.4-alpha. --- .appveyor.yml | 19 +++++++++++++++++++ changes/bug29601 | 6 ++++++ 2 files changed, 25 insertions(+) diff --git a/.appveyor.yml b/.appveyor.yml index 69cbd8e2d..da791faca 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -25,6 +25,25 @@ environment: # hardening doesn't work with mingw-w64-x86_64-gcc, because it's gcc 8 hardening: --disable-gcc-hardening +matrix: + # Don't keep building failing jobs + fast_finish: true + # Skip the 32-bit Windows Server 2016 job, and the 64-bit Windows Server + # 2012 R2 job, to speed up the build. + # The environment variables must be listed without the 'environment' tag. + exclude: + - image: Visual Studio 2017 + target: i686-w64-mingw32 + compiler_path: mingw32 + mingw_prefix: mingw-w64-i686 + hardening: + - image: Visual Studio 2015 + target: x86_64-w64-mingw32 + compiler_path: mingw64 + mingw_prefix: mingw-w64-x86_64 + # hardening doesn't work with mingw-w64-x86_64-gcc, because it's gcc 8 + hardening: --disable-gcc-hardening + install: - ps: >- Function Execute-Command ($commandPath) diff --git a/changes/bug29601 b/changes/bug29601 new file mode 100644 index 000000000..c4ba5fbc8 --- /dev/null +++ b/changes/bug29601 @@ -0,0 +1,6 @@ + o Minor bugfixes (Windows, CI): + - Skip the Appveyor 32-bit Windows Server 2016 job, and 64-bit Windows + Server 2012 R2 job. The remaining 2 jobs still provide coverage of + 64/32-bit, and Windows Server 2016/2012 R2. Also set fast_finish, so + failed jobs terminate the build immediately. + Fixes bug 29601; bugfix on 0.3.5.4-alpha.

1 0

[tor/maint-0.4.0] appveyor: skip two redundant builds to speed up CI on Windows
by nickm＠torproject.org 07 Mar '19

07 Mar '19

commit a479909ee8cd10b22d534e4c0855df4f8fb9807b Author: teor <teor(a)torproject.org> Date: Wed Feb 27 16:11:47 2019 +1000 appveyor: skip two redundant builds to speed up CI on Windows Skip the Appveyor 32-bit Windows Server 2016 job, and 64-bit Windows Server 2012 R2 job. The remaining 2 jobs still provide coverage of 64/32-bit, and Windows Server 2016/2012 R2. Also set fast_finish, so failed jobs terminate the build immediately. Fixes bug 29601; bugfix on 0.3.5.4-alpha. --- .appveyor.yml | 19 +++++++++++++++++++ changes/bug29601 | 6 ++++++ 2 files changed, 25 insertions(+) diff --git a/.appveyor.yml b/.appveyor.yml index 69cbd8e2d..da791faca 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -25,6 +25,25 @@ environment: # hardening doesn't work with mingw-w64-x86_64-gcc, because it's gcc 8 hardening: --disable-gcc-hardening +matrix: + # Don't keep building failing jobs + fast_finish: true + # Skip the 32-bit Windows Server 2016 job, and the 64-bit Windows Server + # 2012 R2 job, to speed up the build. + # The environment variables must be listed without the 'environment' tag. + exclude: + - image: Visual Studio 2017 + target: i686-w64-mingw32 + compiler_path: mingw32 + mingw_prefix: mingw-w64-i686 + hardening: + - image: Visual Studio 2015 + target: x86_64-w64-mingw32 + compiler_path: mingw64 + mingw_prefix: mingw-w64-x86_64 + # hardening doesn't work with mingw-w64-x86_64-gcc, because it's gcc 8 + hardening: --disable-gcc-hardening + install: - ps: >- Function Execute-Command ($commandPath) diff --git a/changes/bug29601 b/changes/bug29601 new file mode 100644 index 000000000..c4ba5fbc8 --- /dev/null +++ b/changes/bug29601 @@ -0,0 +1,6 @@ + o Minor bugfixes (Windows, CI): + - Skip the Appveyor 32-bit Windows Server 2016 job, and 64-bit Windows + Server 2012 R2 job. The remaining 2 jobs still provide coverage of + 64/32-bit, and Windows Server 2016/2012 R2. Also set fast_finish, so + failed jobs terminate the build immediately. + Fixes bug 29601; bugfix on 0.3.5.4-alpha.

1 0