diff options
| author | Alexander Færøy <ahf@torproject.org> | 2023-12-07 21:38:32 +0000 |
|---|---|---|
| committer | Alexander Færøy <ahf@torproject.org> | 2023-12-07 21:38:32 +0000 |
| commit | 8255139694d8c489a9cd5c099f99c2d7f74df74f (patch) | |
| tree | 2b3e2c23ebb036b314a5959b8697259dbf4d921b | |
| parent | af511c6ffaef0884fa7f933a4d3184db936f2b2c (diff) | |
| parent | 1b1f6e8574976918a692f771e22eecd2cdc0fec7 (diff) | |
| download | tor-8255139694d8c489a9cd5c099f99c2d7f74df74f.tar.gz tor-8255139694d8c489a9cd5c099f99c2d7f74df74f.zip | |
Merge branch 'maint-0.4.8' into release-0.4.8
| -rw-r--r-- | changes/ticket40871 | 3 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | contrib/win32build/tor-mingw.nsi.in | 2 | ||||
| -rw-r--r-- | src/core/or/channeltls.c | 10 |
4 files changed, 14 insertions, 5 deletions
diff --git a/changes/ticket40871 b/changes/ticket40871 new file mode 100644 index 0000000000..32a89eed99 --- /dev/null +++ b/changes/ticket40871 @@ -0,0 +1,3 @@ + o Minor bugfixes (bridges, statistics): + - Correctly report statistics for client count over Pluggable transport. + Fixes bug 40871; bugfix on 0.4.8.4 diff --git a/configure.ac b/configure.ac index c2e6b035d7..4ad906419f 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc. dnl See LICENSE for licensing information AC_PREREQ([2.63]) -AC_INIT([tor],[0.4.8.9]) +AC_INIT([tor],[0.4.8.9-dev]) AC_CONFIG_SRCDIR([src/app/main/tor_main.c]) AC_CONFIG_MACRO_DIR([m4]) @@ -18,7 +18,7 @@ AC_DEFINE_UNQUOTED([CONFIG_FLAGS], ["$configure_flags"], [Flags passed to config # version number changes. Tor uses it to make sure that it # only shuts down for missing "required protocols" when those protocols # are listed as required by a consensus after this date. -AC_DEFINE(APPROX_RELEASE_DATE, ["2023-11-09"], # for 0.4.8.9 +AC_DEFINE(APPROX_RELEASE_DATE, ["2023-11-09"], # for 0.4.8.9-dev [Approximate date when this software was released. (Updated when the version changes.)]) # "foreign" means we don't follow GNU package layout standards diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index 3382d9e891..b145b09d21 100644 --- a/contrib/win32build/tor-mingw.nsi.in +++ b/contrib/win32build/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.4.8.9" +!define VERSION "0.4.8.9-dev" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff --git a/src/core/or/channeltls.c b/src/core/or/channeltls.c index 1f5a466777..a79f5c36e8 100644 --- a/src/core/or/channeltls.c +++ b/src/core/or/channeltls.c @@ -360,13 +360,19 @@ channel_tls_handle_incoming(or_connection_t *orconn) /* Register it */ channel_register(chan); + char *transport_name = NULL; + if (channel_tls_get_transport_name_method(TLS_CHAN_TO_BASE(orconn->chan), + &transport_name) < 0) { + transport_name = NULL; + } /* Start tracking TLS connections in the DoS subsystem as soon as possible, * so we can protect against attacks that use partially open connections. */ geoip_note_client_seen(GEOIP_CLIENT_CONNECT, - &TO_CONN(orconn)->addr, NULL, + &TO_CONN(orconn)->addr, transport_name, time(NULL)); - dos_new_client_conn(orconn, NULL); + dos_new_client_conn(orconn, transport_name); + tor_free(transport_name); return chan; } |