diff options
| author | teor <teor@torproject.org> | 2019-04-19 11:48:41 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2019-04-19 11:48:41 +1000 |
| commit | 2ae67fee4244ff3ea1e9f3345f2cfde48cf64435 (patch) | |
| tree | 2dd1f89569835f567fcf0064a2edde80e8b1cc40 | |
| parent | 4a66c2d63634529dc409e4756ba3ffa461444519 (diff) | |
| parent | 389ee834b6795ccabbe3d4c7edfdaf8d89696438 (diff) | |
| download | tor-2ae67fee4244ff3ea1e9f3345f2cfde48cf64435.tar.gz tor-2ae67fee4244ff3ea1e9f3345f2cfde48cf64435.zip | |
Merge remote-tracking branch 'tor-github/pr/745' into maint-0.3.5
| -rw-r--r-- | changes/bug29144 | 5 | ||||
| -rw-r--r-- | src/core/mainloop/connection.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/changes/bug29144 b/changes/bug29144 new file mode 100644 index 0000000000..5801224f14 --- /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 f2a646c5f9..7b8dc7f364 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; |