Merge branch 'tor-gitlab/mr/709'

diff --cc doc/man/tor.1.txt
Simple merge

diff --cc src/app/config/config.c
index fff82be1b7840f9d8a1bf54b14fcd7c3d804bfd3,e2de72c855fe6fbaf994cdf179fd8d8654f55bde..10090f273d3469109d9b437dc114f2ad27391d21
--- 1/src/app/config/config.c
--- 2/src/app/config/config.c
+++ b/src/app/config/config.c
@@@ -377,9 -378,11 +378,11 @@@ static const config_var_t option_vars_[
    OBSOLETE("ClientAutoIPv6ORPort"),
    V(ClientRejectInternalAddresses, BOOL,   "1"),
    V(ClientTransportPlugin,       LINELIST, NULL),
 -  V(ClientUseIPv6,               BOOL,     "0"),
 +  V(ClientUseIPv6,               BOOL,     "1"),
    V(ClientUseIPv4,               BOOL,     "1"),
    V(ConfluxEnabled,              AUTOBOOL, "auto"),
+   VAR("ConfluxClientUX",         STRING,   ConfluxClientUX_option,
+           "throughput"),
    V(ConnLimit,                   POSINT,     "1000"),
    V(ConnDirectionStatistics,     BOOL,     "0"),
    V(ConstrainedSockets,          BOOL,     "0"),

diff --cc src/core/or/conflux_st.h
Simple merge