[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[tor-commits] [tor] 07/07: Merge branch 'tor-gitlab/mr/709'
This is an automated email from the git hooks/post-receive script.
dgoulet pushed a commit to branch main
in repository tor.
commit 9976da93679acc422c174f5e5b5bf890e387f1b1
Merge: 0781c2968d 032d850a2c
Author: David Goulet <dgoulet@xxxxxxxxxxxxxx>
AuthorDate: Wed May 24 11:37:05 2023 -0400
Merge branch 'tor-gitlab/mr/709'
changes/ticket40593 | 16 +++
doc/man/tor.1.txt | 7 ++
src/app/config/config.c | 18 ++++
src/app/config/or_options_st.h | 4 +
src/core/or/conflux.c | 216 ++++++++---------------------------------
src/core/or/conflux_cell.c | 15 +--
src/core/or/conflux_cell.h | 2 +-
src/core/or/conflux_pool.c | 41 ++++++--
src/core/or/conflux_pool.h | 2 +
src/core/or/conflux_st.h | 2 -
src/test/test_conflux_pool.c | 2 +
11 files changed, 126 insertions(+), 199 deletions(-)
diff --cc src/app/config/config.c
index fff82be1b7,e2de72c855..10090f273d
--- a/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"),
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits