Merge branch 'maint-0.4.0'

This commit is contained in:
Nick Mathewson 2019-03-07 08:57:02 -05:00
commit d3fc9aef93
2 changed files with 6 additions and 1 deletions

5
changes/bug29144 Normal file
View file

@ -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.

View file

@ -1541,7 +1541,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;