aboutsummaryrefslogtreecommitdiff
path: root/src/app/config
diff options
context:
space:
mode:
Diffstat (limited to 'src/app/config')
-rw-r--r--src/app/config/auth_dirs.inc11
-rw-r--r--src/app/config/config.c90
-rw-r--r--src/app/config/fallback_dirs.inc958
-rw-r--r--src/app/config/or_options_st.h23
-rw-r--r--src/app/config/resolve_addr.c2
-rw-r--r--src/app/config/testnet.inc1
6 files changed, 571 insertions, 514 deletions
diff --git a/src/app/config/auth_dirs.inc b/src/app/config/auth_dirs.inc
index 278f08bfcf..618e3349b6 100644
--- a/src/app/config/auth_dirs.inc
+++ b/src/app/config/auth_dirs.inc
@@ -1,13 +1,13 @@
-"moria1 orport=9101 "
- "v3ident=D586D18309DED4CD6D57C18FDB97EFA96D330566 "
- "128.31.0.39:9131 9695 DFC3 5FFE B861 329B 9F1A B04C 4639 7020 CE31",
+"moria1 orport=9201 "
+ "v3ident=F533C81CEF0BC0267857C99B2F471ADF249FA232 "
+ "128.31.0.39:9231 1A25C6358DB91342AA51720A5038B72742732498",
"tor26 orport=443 "
"v3ident=14C131DFC5C6F93646BE72FA1401C02A8DF2E8B4 "
"ipv6=[2001:858:2:2:aabb:0:563b:1526]:443 "
"86.59.21.38:80 847B 1F85 0344 D787 6491 A548 92F9 0493 4E4E B85D",
"dizum orport=443 "
"v3ident=E8A9C45EDE6D711294FADF8E7951F4DE6CA56B58 "
- "45.66.33.45:80 7EA6 EAD6 FD83 083C 538F 4403 8BBF A077 587D D755",
+ "45.66.35.11:80 7EA6 EAD6 FD83 083C 538F 4403 8BBF A077 587D D755",
"Serge orport=9001 bridge "
"66.111.2.131:9030 BA44 A889 E64B 93FA A2B1 14E0 2C2A 279A 8555 C533",
"gabelmoo orport=443 "
@@ -22,9 +22,6 @@
"v3ident=49015F787433103580E3B66A1707A00E60F2D15B "
"ipv6=[2001:67c:289c::9]:80 "
"171.25.193.9:443 BD6A 8292 55CB 08E6 6FBE 7D37 4836 3586 E46B 3810",
-"Faravahar orport=443 "
- "v3ident=EFCBE720AB3A82B99F9E953CD5BF50F7EEFC7B97 "
- "154.35.175.225:80 CF6D 0AAF B385 BE71 B8E1 11FC 5CFF 4B47 9237 33BC",
"longclaw orport=443 "
"v3ident=23D15D965BC35114467363C165C4F724B64B4F66 "
"199.58.81.140:80 74A9 1064 6BCE EFBC D2E8 74FC 1DC9 9743 0F96 8145",
diff --git a/src/app/config/config.c b/src/app/config/config.c
index 3c3499696b..102d1bbc04 100644
--- a/src/app/config/config.c
+++ b/src/app/config/config.c
@@ -77,6 +77,7 @@
#include "core/or/circuitmux_ewma.h"
#include "core/or/circuitstats.h"
#include "core/or/connection_edge.h"
+#include "trunnel/conflux.h"
#include "core/or/dos.h"
#include "core/or/policies.h"
#include "core/or/relay.h"
@@ -88,9 +89,11 @@
#include "feature/control/control.h"
#include "feature/control/control_auth.h"
#include "feature/control/control_events.h"
+#include "feature/dircache/dirserv.h"
#include "feature/dirclient/dirclient_modes.h"
#include "feature/hibernate/hibernate.h"
#include "feature/hs/hs_config.h"
+#include "feature/hs/hs_pow.h"
#include "feature/metrics/metrics.h"
#include "feature/nodelist/dirlist.h"
#include "feature/nodelist/networkstatus.h"
@@ -179,7 +182,7 @@ static const char unix_q_socket_prefix[] = "unix:\"";
#define MAX_CONSTRAINED_TCP_BUFFER 262144 /* 256k */
/** macro to help with the bulk rename of *DownloadSchedule to
- * *DowloadInitialDelay . */
+ * *DownloadInitialDelay . */
#ifndef COCCI
#define DOWNLOAD_SCHEDULE(name) \
{ (#name "DownloadSchedule"), (#name "DownloadInitialDelay"), 0, 1 }
@@ -375,8 +378,12 @@ 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(CompiledProofOfWorkHash, AUTOBOOL, "auto"),
+ V(ConfluxEnabled, AUTOBOOL, "auto"),
+ VAR("ConfluxClientUX", STRING, ConfluxClientUX_option,
+ "throughput"),
V(ConnLimit, POSINT, "1000"),
V(ConnDirectionStatistics, BOOL, "0"),
V(ConstrainedSockets, BOOL, "0"),
@@ -476,6 +483,13 @@ static const config_var_t option_vars_[] = {
#ifdef _WIN32
V(GeoIPFile, FILENAME, "<default>"),
V(GeoIPv6File, FILENAME, "<default>"),
+#elif defined(__ANDROID__)
+ /* Android apps use paths that are configured at runtime.
+ * /data/local/tmp is guaranteed to exist, but will only be
+ * usable by the 'shell' and 'root' users, so this fallback is
+ * for debugging only. */
+ V(GeoIPFile, FILENAME, "/data/local/tmp/geoip"),
+ V(GeoIPv6File, FILENAME, "/data/local/tmp/geoip6"),
#else
V(GeoIPFile, FILENAME,
SHARE_DATADIR PATH_SEPARATOR "tor" PATH_SEPARATOR "geoip"),
@@ -507,6 +521,9 @@ static const config_var_t option_vars_[] = {
LINELIST_S, RendConfigLines, NULL),
VAR("HiddenServiceOnionBalanceInstance",
LINELIST_S, RendConfigLines, NULL),
+ VAR("HiddenServicePoWDefensesEnabled", LINELIST_S, RendConfigLines, NULL),
+ VAR("HiddenServicePoWQueueRate", LINELIST_S, RendConfigLines, NULL),
+ VAR("HiddenServicePoWQueueBurst", LINELIST_S, RendConfigLines, NULL),
VAR("HiddenServiceStatistics", BOOL, HiddenServiceStatistics_option, "1"),
V(ClientOnionAuthDir, FILENAME, NULL),
OBSOLETE("CloseHSClientCircuitsImmediatelyOnTimeout"),
@@ -549,7 +566,7 @@ static const config_var_t option_vars_[] = {
V(MaxConsensusAgeForDiffs, INTERVAL, "0 seconds"),
VAR("MaxMemInQueues", MEMUNIT, MaxMemInQueues_raw, "0"),
OBSOLETE("MaxOnionsPending"),
- V(MaxOnionQueueDelay, MSEC_INTERVAL, "1750 msec"),
+ V(MaxOnionQueueDelay, MSEC_INTERVAL, "0"),
V(MaxUnparseableDescSizeToLog, MEMUNIT, "10 MB"),
VPORT(MetricsPort),
V(MetricsPortPolicy, LINELIST, NULL),
@@ -624,10 +641,10 @@ static const config_var_t option_vars_[] = {
V(RejectPlaintextPorts, CSV, ""),
V(RelayBandwidthBurst, MEMUNIT, "0"),
V(RelayBandwidthRate, MEMUNIT, "0"),
- V(RendPostPeriod, INTERVAL, "1 hour"), /* Used internally. */
V(RephistTrackTime, INTERVAL, "24 hours"),
V_IMMUTABLE(RunAsDaemon, BOOL, "0"),
V(ReducedExitPolicy, BOOL, "0"),
+ V(ReevaluateExitPolicy, BOOL, "0"),
OBSOLETE("RunTesting"), // currently unused
V_IMMUTABLE(Sandbox, BOOL, "0"),
V(SafeLogging, STRING, "1"),
@@ -675,6 +692,8 @@ static const config_var_t option_vars_[] = {
V(VanguardsLiteEnabled, AUTOBOOL, "auto"),
V(UseMicrodescriptors, AUTOBOOL, "auto"),
OBSOLETE("UseNTorHandshake"),
+ VAR("__AlwaysCongestionControl", BOOL, AlwaysCongestionControl, "0"),
+ VAR("__SbwsExit", BOOL, SbwsExit, "0"),
V_IMMUTABLE(User, STRING, NULL),
OBSOLETE("UserspaceIOCPBuffers"),
OBSOLETE("V1AuthoritativeDirectory"),
@@ -985,6 +1004,7 @@ set_options(or_options_t *new_val, char **msg)
config_line_t *changes =
config_get_changes(get_options_mgr(), old_options, new_val);
control_event_conf_changed(changes);
+ connection_reapply_exit_policy(changes);
config_free_lines(changes);
}
@@ -2726,11 +2746,19 @@ list_deprecated_options(void)
static void
list_enabled_modules(void)
{
- printf("%s: %s\n", "relay", have_module_relay() ? "yes" : "no");
- printf("%s: %s\n", "dirauth", have_module_dirauth() ? "yes" : "no");
- // We don't list dircache, because it cannot be enabled or disabled
- // independently from relay. Listing it here would proliferate
- // test variants in test_parseconf.sh to no useful purpose.
+ static const struct {
+ const char *name;
+ bool have;
+ } list[] = {
+ { "relay", have_module_relay() },
+ { "dirauth", have_module_dirauth() },
+ { "dircache", have_module_dircache() },
+ { "pow", have_module_pow() }
+ };
+
+ for (unsigned i = 0; i < sizeof list / sizeof list[0]; i++) {
+ printf("%s: %s\n", list[i].name, list[i].have ? "yes" : "no");
+ }
}
/** Prints compile-time and runtime library versions. */
@@ -2972,19 +3000,11 @@ config_ensure_bandwidth_cap(uint64_t *value, const char *desc, char **msg)
return 0;
}
-/** Lowest allowable value for RendPostPeriod; if this is too low, hidden
- * services can overload the directory system. */
-#define MIN_REND_POST_PERIOD (10*60)
-#define MIN_REND_POST_PERIOD_TESTING (5)
-
/** Highest allowable value for CircuitsAvailableTimeout.
* If this is too large, client connections will stay open for too long,
* incurring extra padding overhead. */
#define MAX_CIRCS_AVAILABLE_TIME (24*60*60)
-/** Highest allowable value for RendPostPeriod. */
-#define MAX_DIR_PERIOD ((7*24*60*60)/2)
-
/** Lowest allowable value for MaxCircuitDirtiness; if this is too low, Tor
* will generate too many circuits and potentially overload the network. */
#define MIN_MAX_CIRCUIT_DIRTINESS 10
@@ -3538,27 +3558,27 @@ options_validate_cb(const void *old_options_, void *options_, char **msg)
return -1;
}
+ options->ConfluxClientUX = CONFLUX_UX_HIGH_THROUGHPUT;
+ if (options->ConfluxClientUX_option) {
+ if (!strcmp(options->ConfluxClientUX_option, "latency"))
+ options->ConfluxClientUX = CONFLUX_UX_MIN_LATENCY;
+ else if (!strcmp(options->ConfluxClientUX_option, "throughput"))
+ options->ConfluxClientUX = CONFLUX_UX_HIGH_THROUGHPUT;
+ else if (!strcmp(options->ConfluxClientUX_option, "latency_lowmem"))
+ options->ConfluxClientUX = CONFLUX_UX_LOW_MEM_LATENCY;
+ else if (!strcmp(options->ConfluxClientUX_option, "throughput_lowmem"))
+ options->ConfluxClientUX = CONFLUX_UX_LOW_MEM_THROUGHPUT;
+ else
+ REJECT("ConfluxClientUX must be 'latency', 'throughput, "
+ "'latency_lowmem', or 'throughput_lowmem'");
+ }
+
if (options_validate_publish_server(old_options, options, msg) < 0)
return -1;
if (options_validate_relay_padding(old_options, options, msg) < 0)
return -1;
- const int min_rendpostperiod =
- options->TestingTorNetwork ?
- MIN_REND_POST_PERIOD_TESTING : MIN_REND_POST_PERIOD;
- if (options->RendPostPeriod < min_rendpostperiod) {
- log_warn(LD_CONFIG, "RendPostPeriod option is too short; "
- "raising to %d seconds.", min_rendpostperiod);
- options->RendPostPeriod = min_rendpostperiod;
- }
-
- if (options->RendPostPeriod > MAX_DIR_PERIOD) {
- log_warn(LD_CONFIG, "RendPostPeriod is too large; clipping to %ds.",
- MAX_DIR_PERIOD);
- options->RendPostPeriod = MAX_DIR_PERIOD;
- }
-
/* Check the Single Onion Service options */
if (options_validate_single_onion(options, msg) < 0)
return -1;
@@ -4494,6 +4514,10 @@ options_init_from_torrc(int argc, char **argv)
if (config_line_find(cmdline_only_options, "--version")) {
printf("Tor version %s.\n",get_version());
+#ifdef ENABLE_GPL
+ printf("This build of Tor is covered by the GNU General Public License "
+ "(https://www.gnu.org/licenses/gpl-3.0.en.html)\n");
+#endif
printf("Tor is running on %s with Libevent %s, "
"%s %s, Zlib %s, Liblzma %s, Libzstd %s and %s %s as libc.\n",
get_uname(),
@@ -7287,7 +7311,7 @@ getinfo_helper_config(control_connection_t *conn,
}
/* Check whether an address has already been set against the options
- * depending on address family and destination type. Any exsting
+ * depending on address family and destination type. Any existing
* value will lead to a fail, even if it is the same value. If not
* set and not only validating, copy it into this location too.
* Returns 0 on success or -1 if this address is already set.
diff --git a/src/app/config/fallback_dirs.inc b/src/app/config/fallback_dirs.inc
index ea1928e4c0..75e00926ef 100644
--- a/src/app/config/fallback_dirs.inc
+++ b/src/app/config/fallback_dirs.inc
@@ -3,743 +3,748 @@
/* timestamp=20210412000000 */
/* source=offer-list */
//
-// Generated on: Thu, 21 Oct 2021 13:07:39 +0000
+// Generated on: Wed, 30 Aug 2023 12:43:28 +0000
-"62.210.105.46 orport=9001 id=ADB98B27D7A3FB5732068FD23602A1BCB3BE9F38"
-/* nickname=Assange008fr */
+"213.239.215.221 orport=9001 id=021DDCD687FD505B7EA7E75DA6CEF0D778AA07FB"
+" ipv6=[2a01:4f8:a0:90b0:789d:6a4:95f3:a78c]:9001"
+/* nickname=GrmmlDag */
/* extrainfo=0 */
/* ===== */
,
-"95.128.43.164 orport=443 id=616081EC829593AF4232550DE6FFAA1D75B37A90"
-" ipv6=[2a02:ec0:209:10::4]:443"
-/* nickname=AquaRayTerminus */
+"51.81.56.229 orport=443 id=A4436E70B8D7E7C5482EFCC55D53D39EC6AE905F"
+/* nickname=vrienden */
/* extrainfo=0 */
/* ===== */
,
-"5.79.79.133 orport=443 id=D079D6818926684C5979C18171FB18862A4A5792"
-/* nickname=beerbox */
+"159.223.138.107 orport=443 id=63B4823282B1A669DE17E9D52E015ED55323F880"
+/* nickname=marleybone7 */
/* extrainfo=0 */
/* ===== */
,
-"91.121.103.117 orport=9001 id=CA53F344DB85248D69A97E900A0EC3C31AC04D25"
-/* nickname=NoSuchRelay */
+"45.88.171.100 orport=9200 id=00D846D23455162A1357680CDA3C2C21351E1A18"
+/* nickname=prsv */
/* extrainfo=0 */
/* ===== */
,
-"109.70.100.9 orport=443 id=C8AE26D4819504D0157AD4C5DE7D5A0A7E190D10"
-" ipv6=[2a03:e600:100::9]:443"
-/* nickname=rucola */
+"65.49.20.10 orport=443 id=CFD34B1E1C4FE1363C39169D65389CF3856810B1"
+/* nickname=BraveLuxor */
/* extrainfo=0 */
/* ===== */
,
-"83.205.231.204 orport=9001 id=E05CAC929E391787077066C29461A9D22ECF0809"
-/* nickname=albator */
+"107.189.5.7 orport=9100 id=FA4C966C04B80B2A39AD5A0175EE1824EF66137A"
+" ipv6=[2605:6400:30:f534:ae1d:c3d9:9941:d85e]:9100"
+/* nickname=Quetzalcoatl */
/* extrainfo=0 */
/* ===== */
,
-"37.252.187.111 orport=443 id=EE4AF632058F0734C1426B1AD689F47445CA2056"
-" ipv6=[2a00:63c1:c:111::2]:443"
-/* nickname=rinderwahnRelay7L */
+"199.249.230.83 orport=443 id=3CA0D15567024D2E0B557DC0CF3E962B37999A79"
+" ipv6=[2620:7:6001::ffff:c759:e653]:80"
+/* nickname=QuintexAirVPN30 */
/* extrainfo=0 */
/* ===== */
,
-"144.76.157.242 orport=9001 id=00C22D3BC1822EB8EA380AF04245337399E796E2"
-" ipv6=[2a01:4f8:200:30f5::103]:9001"
-/* nickname=iriseden */
+"31.131.2.17 orport=443 id=987D0706D42070F1E2142A9FCCB56B3887808D34"
+/* nickname=bolard */
/* extrainfo=0 */
/* ===== */
,
-"212.47.233.86 orport=9001 id=B4CAFD9CBFB34EC5DAAC146920DC7DFAFE91EA20"
-" ipv6=[2001:bc8:630:194::1]:9001"
-/* nickname=netimanmu */
+"50.73.63.162 orport=9001 id=D76E1FDC7A3D899282BB882F74111B36A6D14B64"
+/* nickname=2propstor */
/* extrainfo=0 */
/* ===== */
,
-"173.212.231.228 orport=9001 id=55403B9653A81F68C39787E000BD9F97E1F3B250"
-/* nickname=StriveForFreedom */
+"185.100.87.141 orport=9001 id=9CF224CA8A67AA4EB4F1F4CF2DD8A8B216A399BC"
+" ipv6=[2a06:1700:0:e::1]:9001"
+/* nickname=tritium0 */
/* extrainfo=0 */
/* ===== */
,
-"62.216.54.29 orport=9001 id=16824F885D72B4FA7A5090E08D877E5404BC214D"
-/* nickname=guidemenow */
+"95.216.202.181 orport=9001 id=24893333D304C74CCDD11D99090C0471DCFED589"
+/* nickname=eternaljenny */
/* extrainfo=0 */
/* ===== */
,
-"213.239.213.190 orport=443 id=4E98AA295B7171996D18DD1F6A19F64AB4036B4A"
-/* nickname=summalummadooma */
+"167.235.112.134 orport=9000 id=7230711A0C47B01ED5C2A091941BBC88D59A50C4"
+" ipv6=[2a01:4f8:2200:14dc:120::100]:9000"
+/* nickname=jhsfirsttorrelay */
/* extrainfo=0 */
/* ===== */
,
-"5.9.37.162 orport=9001 id=6C1A8CBE589906EEC6E73F4F286AC29AF7521E1D"
-" ipv6=[2a01:4f8:161:21a9::2]:9001"
-/* nickname=vahShei7Eeth */
+"93.123.12.112 orport=443 id=208047D21967ACA9BCD442B20C300603AD09BFC5"
+/* nickname=Basher */
/* extrainfo=0 */
/* ===== */
,
-"82.69.47.114 orport=443 id=43E896D36AAB20B5B63094BBC52CAD4B560E47BF"
-/* nickname=DeLoreanDynamite */
+"176.126.253.190 orport=9001 id=B5DE82BBE82B0950A2AFB488F1D51EC92BF0A6F6"
+/* nickname=Uncle */
/* extrainfo=0 */
/* ===== */
,
-"51.15.177.140 orport=993 id=ECD239A3B2CAD7375D218B624BCA270CDBFE2A29"
-" ipv6=[2001:bc8:3fec:500:7ea::]:993"
-/* nickname=Casper10 */
+"152.69.198.49 orport=9001 id=CF762EF3C86B104C301511894547C72371F952A4"
+/* nickname=yudejp */
/* extrainfo=0 */
/* ===== */
,
-"209.141.57.122 orport=443 id=051FB296CDF787B5B97A9F2C5CD6FA3E10C27045"
-/* nickname=Unnamed */
+"50.47.238.242 orport=49092 id=210E9B4AE14D78627105EEDBDA8D2C3EFA64D482"
+/* nickname=relay */
/* extrainfo=0 */
/* ===== */
,
-"193.234.15.58 orport=443 id=F24F8BEA2779A79111F33F6832B062BED306B9CB"
-" ipv6=[2a00:1c20:4089:1234:cdae:1b3e:cc38:3d45]:443"
-/* nickname=jaures2 */
+"164.40.199.72 orport=400 id=83CD7B944DB54FFC54DB06A09DB33CACD6A83DC4"
+/* nickname=Tornado */
/* extrainfo=0 */
/* ===== */
,
-"185.228.138.252 orport=8080 id=91BAB54C6923454F4E5EDC59313C45002B238665"
-" ipv6=[2a03:4000:23:409:748d:52ff:fe41:cdcc]:8080"
-/* nickname=CryptoHouse */
+"94.130.185.68 orport=9001 id=A9E43431EF473BEEF0EEC98DBDDD1B8C3E3FB071"
+" ipv6=[2a01:4f8:1c0c:453a::1]:9001"
+/* nickname=torthias */
/* extrainfo=0 */
/* ===== */
,
-"77.23.45.123 orport=9001 id=5887DD4FC027A14DE4985429C38BF78C297B7795"
-/* nickname=Shredder */
+"188.213.31.125 orport=9001 id=B6E40167BE842F279B11B2A0F594718387AA75E5"
+" ipv6=[2a03:75c0:3c:a257::1]:9001"
+/* nickname=Neyo */
/* extrainfo=0 */
/* ===== */
,
-"82.103.140.87 orport=443 id=A1B7C1F83E5DA4376FD2E1DBA7AC28A71AB332AD"
-/* nickname=arnall */
+"185.220.100.247 orport=9100 id=B891CB6370CF7C51C6FB24D80947AFB7ED463D00"
+" ipv6=[2a0b:f4c0:16c:9::1]:9100"
+/* nickname=relayongrolantor */
/* extrainfo=0 */
/* ===== */
,
-"37.221.66.248 orport=443 id=A28D6C0BAA9EEBD288713357C46CF6EF081EF673"
-" ipv6=[2001:678:6d4:6020::4dea:105]:443"
-/* nickname=DTFNODE64 */
+"185.225.18.102 orport=9001 id=2FA6A81D52476C4D64ED5F385CBF5FBE4937F4CB"
+/* nickname=gralrush */
/* extrainfo=0 */
/* ===== */
,
-"109.70.100.1 orport=443 id=530277866466A1425F43A73DBFCB5FC7410C9852"
-" ipv6=[2a03:e600:100::1]:443"
-/* nickname=spargel */
+"136.58.8.191 orport=9001 id=BA17200D627061F1A118A006346784C4892A7713"
+/* nickname=Unnamed */
/* extrainfo=0 */
/* ===== */
,
-"185.82.127.141 orport=9001 id=34FA04EFC21C4B8461FCE82E908FDD53DF1E7962"
-/* nickname=s0menickname */
+"51.75.153.22 orport=9000 id=6E5F1BE327BFA07D4A6E9D930315E906A4C641DB"
+/* nickname=wandjina */
/* extrainfo=0 */
/* ===== */
,
-"45.76.218.50 orport=9001 id=1FCA426BBD7EDCC6C0FFF013D0FD9531B16A5845"
-/* nickname=myTorRelay2 */
+"104.244.79.44 orport=9100 id=CCCFD8D5FD21AC796234D914F1B7CC33ADCE52F8"
+" ipv6=[2605:6400:30:f38b:28b3:cd24:51f3:e412]:9100"
+/* nickname=Quetzalcoatl */
/* extrainfo=0 */
/* ===== */
,
-"54.36.205.38 orport=9001 id=5DB9AE27A44EB7B476CC04A66C67A71C97A001E6"
-/* nickname=Chenjesu */
+"185.38.13.37 orport=443 id=4EA8C351DBC9BB1FB5A04AC00314B7165232DF58"
+" ipv6=[2a02:2a38:1:2796:225:90ff:fe67:9dd6]:443"
+/* nickname=uKDbRBw5GFFLYfg4 */
/* extrainfo=0 */
/* ===== */
,
-"185.72.247.145 orport=9001 id=130E69E8F783DEF256E757FA78154B7DC2A39E0E"
-/* nickname=funkturm */
+"135.148.52.231 orport=443 id=BA6E064596B86AF9F55F0603A82C90E958E86E7A"
+/* nickname=twoandtwoone */
/* extrainfo=0 */
/* ===== */
,
-"140.78.100.38 orport=5443 id=23D5D8219A8EB7610AB33CFAD589FD72A844356A"
-/* nickname=INSRelay38at5443 */
+"107.189.12.3 orport=9000 id=B274599CD37F4D5B2C407DC81E478135F3297EFE"
+" ipv6=[2605:6400:30:eb71:51b7:4869:7579:3aa1]:9000"
+/* nickname=Quetzalcoatl */
/* extrainfo=0 */
/* ===== */
,
-"173.75.39.61 orport=9001 id=023EBBC57BEB7F45473B3DC2AA811FB3AABA4466"
-/* nickname=tconionrelay */
+"91.45.183.82 orport=23 id=A690C6AA8102C027D297AF3401BFE16918CCF7A6"
+/* nickname=H3rmi */
/* extrainfo=0 */
/* ===== */
,
-"185.4.132.135 orport=443 id=A0056E0F3773DD99C1ED298B956A2ACEE1BFB5FD"
-/* nickname=Grexit */
+"104.128.48.237 orport=9001 id=F8B62D3A367F726CD011EC9A931B54F4B9DD9BB0"
+/* nickname=vanguardarchie */
/* extrainfo=0 */
/* ===== */
,
-"104.244.77.250 orport=443 id=E312A938D71045BE3A5C1FF3AB87CF7464194861"
-" ipv6=[2605:6400:30:faa9:4abe:8b09:7ef9:18e6]:443"
-/* nickname=Daenerys */
+"45.158.77.29 orport=9200 id=025DDB017D79460C4A3F6795D52FEFBB56A133F3"
+" ipv6=[2a04:ecc0:8:a8:4567:491:0:1]:9200"
+/* nickname=prsv */
/* extrainfo=0 */
/* ===== */
,
-"45.67.229.37 orport=9001 id=34F2DBF5595FF8323665BEC7DD8D2D28F9697B2C"
-/* nickname=Pickachu */
+"54.36.120.156 orport=443 id=D0273C8566CC9AECE4C762376C9B066FE0F1DADD"
+/* nickname=Kimchi */
/* extrainfo=0 */
/* ===== */
,
-"193.108.117.103 orport=9001 id=438F3EA4C9FB0DB63F5377A3271AB5435FAD7E04"
-/* nickname=dolemite */
+"67.205.139.175 orport=443 id=C899F20DC8005037C86B0E447857383D95FC7422"
+" ipv6=[2604:a880:400:d0::237f:f001]:443"
+/* nickname=belovachapNYC */
/* extrainfo=0 */
/* ===== */
,
-"158.101.138.180 orport=443 id=B1A0F1143789466AADD5FAE5948C8138548EECEC"
-" ipv6=[2603:c021:8000:d00::c1]:443"
-/* nickname=KagamineLenWoRd */
+"205.185.124.200 orport=443 id=51BD25EE06C46E4466427D4ABF94F2964514EB2F"
+" ipv6=[2605:6400:20:c3d::1001]:443"
+/* nickname=BeCarefulOutThere */
/* extrainfo=0 */
/* ===== */
,
-"110.141.223.194 orport=9001 id=1619F4FCE1C5324CAB703EAD94285B1ABE39F912"
-/* nickname=PCGGRelay */
+"135.125.202.252 orport=9001 id=720ABE4554C55EE6F6099491CA55D1F5550512C5"
+/* nickname=slotor02 */
/* extrainfo=0 */
/* ===== */
,
-"104.149.139.42 orport=8080 id=270EECB837AD914C01ACC777152AEEB1EBCDBDE5"
-/* nickname=Phoenix */
+"174.128.250.163 orport=80 id=AE1B1A9B44DC87821D69F04DC4933DECC555E536"
+/* nickname=rockstars2 */
/* extrainfo=0 */
/* ===== */
,
-"58.107.88.237 orport=9001 id=0D8877392F2FF5AD8D8E5BC438087F02EF97B904"
-/* nickname=Starlight */
+"45.56.90.176 orport=443 id=D39F66DE4910D3AE1C3415E4501219D3B99E184E"
+/* nickname=3zpzl3mnsqzy */
/* extrainfo=0 */
/* ===== */
,
-"198.245.61.171 orport=443 id=B1AE47B97B6952B3B8B2CD19B57183CF5C801348"
-/* nickname=Unnamed */
+"80.209.233.177 orport=55203 id=632CD6230557A218E553778144F12536CE801DA8"
+" ipv6=[2a02:7b40:50d1:e9b1::1]:55203"
+/* nickname=Perpetual6726 */
/* extrainfo=0 */
/* ===== */
,
-"198.211.40.226 orport=9001 id=CB5700E1FB46FC98251DD8F0852B63A3B78DB830"
-/* nickname=jaalkabil */
+"176.31.35.149 orport=443 id=74EF2F2181B0F9A2AC08EBE1C3F5AC2C6FFFFA94"
+" ipv6=[2001:41d0:8:522c:24d9:6a97:78db:2bcb]:443"
+/* nickname=elc5 */
/* extrainfo=0 */
/* ===== */
,
-"94.130.200.167 orport=443 id=CD39C258265B25EAA4ABA4FDCB2DF98104CAA362"
-/* nickname=normaray */
+"67.175.119.217 orport=9001 id=6C384BB9379162E90E387D02E53FF35A4E647500"
+/* nickname=SWMI1 */
/* extrainfo=0 */
/* ===== */
,
-"136.243.60.188 orport=9001 id=675CFAC38BE3C9A26C3A2DD7CBC0E616F68624CA"
-" ipv6=[2a01:4f8:212:1b8b:3::8]:9001"
-/* nickname=mullbinde5 */
+"185.142.239.49 orport=443 id=98CDDAF76419C5DBCBCF512D87E3F99BA5F22770"
+/* nickname=OMICRON */
/* extrainfo=0 */
/* ===== */
,
-"81.28.206.216 orport=9001 id=BC5F00B573D277C4BFA8F0FBAA47E074D0994C1C"
-/* nickname=fs0ciety */
+"91.201.65.29 orport=9001 id=2CD317C624803B77EAD32C96382884B0CAD4DB3F"
+/* nickname=Assange016it */
/* extrainfo=0 */
/* ===== */
,
-"78.198.147.227 orport=9001 id=867982ADCFBE55EC1C00A5B34C8991FF87605906"
-/* nickname=roTor */
+"198.58.107.53 orport=9001 id=2892073608985977DED33F98A9FA27A9C47C8B61"
+" ipv6=[2600:3c00::f03c:91ff:fe73:f9ba]:9001"
+/* nickname=intothetylerzone */
/* extrainfo=0 */
/* ===== */
,
-"23.239.113.101 orport=443 id=F98A70E5427BFF111640011F7AE31E537ECF1DD2"
-/* nickname=MarinAsagi */
+"37.252.255.135 orport=9001 id=824862C40A81327DE807F44A7DB9827A62B86B57"
+" ipv6=[2a00:11c0:1c:311::5]:9001"
+/* nickname=lokit13 */
/* extrainfo=0 */
/* ===== */
,
-"173.212.219.49 orport=6666 id=0A5476625BAC0573A82FCB432ACED70E1ED83E93"
-" ipv6=[2a02:c207:2047:1305::1]:6666"
-/* nickname=OhYee */
+"185.220.101.201 orport=443 id=EBF648E1CF3FA3AC46AA272857BCAFCCD70D49FC"
+" ipv6=[2a0b:f4c2:2:1::201]:443"
+/* nickname=ForPrivacyNET */
/* extrainfo=0 */
/* ===== */
,
-"52.205.15.239 orport=9001 id=87AA1BE4A39529DD86194738DFB59DC698F3136B"
-/* nickname=BarryBen */
+"188.68.46.245 orport=9001 id=856B7EFB7E09D02A29DD2FF024B7E1EFE21FE9EB"
+" ipv6=[2a03:4000:22:175:a452:acff:fefc:987f]:9001"
+/* nickname=Piratenpartei02 */
/* extrainfo=0 */
/* ===== */
,
-"68.71.27.78 orport=9001 id=262B0B749C9088446A5521C4E98173DED815FD5A"
-/* nickname=ALiteralBird */
+"45.138.16.113 orport=110 id=35C2CE1938137F35AAB07E0CB4B918A5D56F40C9"
+/* nickname=Quetzalcoatl */
/* extrainfo=0 */
/* ===== */
,
-"185.162.251.135 orport=9001 id=166850D169CC7956E77525A1A9228BC4563CFC8B"
-" ipv6=[2a03:4000:1a:5c5:38dc:87ff:fe07:85fb]:9001"
-/* nickname=Piratenpartei10 */
+"198.24.164.98 orport=443 id=B34D07BFCBBF179CD6D0F440293A17778893EB76"
+/* nickname=bonkers */
/* extrainfo=0 */
/* ===== */
,
-"157.90.38.9 orport=443 id=42A51FFF7AB2A2F396CB924B56676F09BCB52245"
-/* nickname=SoySauceR */
+"95.216.19.41 orport=9030 id=F50755D5018C23F6CD115F23C95CCB2DC8B608B1"
+" ipv6=[2a01:4f9:2a:134f::2]:9030"
+/* nickname=Hypervistor */
/* extrainfo=0 */
/* ===== */
,
-"217.79.178.53 orport=444 id=9C1559C46AD0279EEF6FD187E1B27D939C303086"
-" ipv6=[2001:4ba0:cafe:5bf::1]:444"
-/* nickname=JanKuciak */
+"45.158.77.241 orport=9000 id=FC6F665E3C0637976DFF2E128E2DA2684E6633AA"
+" ipv6=[2a04:ecc0:8:a8:4567:625:0:1]:9000"
+/* nickname=prsv */
/* extrainfo=0 */
/* ===== */
,
-"195.154.112.228 orport=9001 id=CC2DD888299ED7B7CA7D7B930352A074EBE1E906"
-/* nickname=justarandomrelay */
+"167.114.36.23 orport=8458 id=243380AD3D2924A62B137FE0FB64E8017D04236F"
+" ipv6=[2607:5300:201:3100::465b]:8458"
+/* nickname=Thorgal314 */
/* extrainfo=0 */
/* ===== */
,
-"91.194.84.89 orport=8443 id=1AAC19D892F84910AB94C45092241ABA3CFC4C89"
-" ipv6=[2001:4ba0:ffff:1ce::2]:8443"
-/* nickname=ForPrivacyNET */
-/* extrainfo=0 */
-/* ===== */
-,
-"159.196.69.117 orport=9001 id=B9A8969537739F89CBB02E2A91CECFE154B276C7"
-/* nickname=Aurora */
+"74.208.182.78 orport=9001 id=09AF5C7A59852EF44FF56D30C01D5F412FD19786"
+/* nickname=Unnamed */
/* extrainfo=0 */
/* ===== */
,
-"46.38.236.250 orport=9001 id=20974D28EB668E689D4256046E0E32034375A0A2"
-" ipv6=[2a03:4000:2:ba4:88e9:eff:fe89:3637]:9001"
-/* nickname=cvbnet1 */
+"185.195.71.12 orport=443 id=46F90EF3A3628C134DBB4654D0E4FF7EB914B690"
+/* nickname=AccessNow010 */
/* extrainfo=0 */
/* ===== */
,
-"209.141.39.200 orport=443 id=D0F40C637C5F93D823AAC497007FD07A2F0FABB5"
-" ipv6=[2605:6400:20:21de::1]:443"
-/* nickname=HogTheHedges */
+"94.16.116.156 orport=9005 id=FF31F20E0352174EE951E38B5C6149896C76400A"
+/* nickname=BizareWorkerKA02 */
/* extrainfo=0 */
/* ===== */
,
-"5.135.156.12 orport=4899 id=5558F546D2A996DD2F4B6A62A218DF23848452E3"
-/* nickname=jakfrancjamoze */
+"89.185.85.140 orport=443 id=F59D3D313A027703E51DC7DF793F2ED106C2E372"
+" ipv6=[2a12:5940:9101::2]:443"
+/* nickname=cozybeardev */
/* extrainfo=0 */
/* ===== */
,
-"83.161.151.178 orport=9001 id=A98ADD972045D3CCAEE65C788C3F175BAEA3E324"
-/* nickname=2Contribute */
+"205.185.117.149 orport=443 id=DA1B8B8D617909902572790CE8BB99DA502C6485"
+" ipv6=[2605:6400:20:3ea:c2a3:1162:7224:e5df]:443"
+/* nickname=Mjolnir */
/* extrainfo=0 */
/* ===== */
,
-"85.214.141.24 orport=9001 id=BCC93B0ACA325374086A5100D02843A04EBDCC00"
-" ipv6=[2a01:238:420e:ae00:1c37:63c1:24c0:ff75]:9001"
-/* nickname=tor1VaxariNet */
+"46.41.150.10 orport=8014 id=8D06711A3BEC64D0F75E8503424B16F8FA43EF5A"
+" ipv6=[2a02:25aa:1:9000::2271]:8014"
+/* nickname=horseController */
/* extrainfo=0 */
/* ===== */
,
-"199.195.250.77 orport=443 id=58B44B5591A96EC08114B041CC6B1BB1521DF2BE"
-" ipv6=[2605:6400:10:549::1]:443"
-/* nickname=UnvisitedNativity */
+"45.139.122.241 orport=9001 id=669F38B0598250E25E221BC3F66782E8D5E669AE"
+/* nickname=OnMyMomma */
/* extrainfo=0 */
/* ===== */
,
-"185.100.87.250 orport=8443 id=ABD9D46C3C026CF6B88574A0707D0BF75A067999"
-" ipv6=[2a06:1700:0:12::1]:8443"
-/* nickname=artikel10buc01 */
+"199.249.230.142 orport=443 id=18E753214CD827244280BBD36AAC4F8E70B3EE8D"
+" ipv6=[2620:7:6001::142]:80"
+/* nickname=Quintex53 */
/* extrainfo=0 */
/* ===== */
,
-"178.20.55.16 orport=443 id=EFAE44728264982224445E96214C15F9075DEE1D"
-/* nickname=marcuse1 */
+"178.128.241.183 orport=9001 id=B7F27FBA6058F4F6D2ECBB715DE7539AF9E6C7BC"
+" ipv6=[2a03:b0c0:2:d0::1220:8001]:9001"
+/* nickname=platinumbutterfly */
/* extrainfo=0 */
/* ===== */
,
-"151.237.185.134 orport=9001 id=1BBD716B4973D96E570D334A5776978BFF7E0E5D"
-/* nickname=lecirque */
+"107.189.14.4 orport=9000 id=85186D4C2F0E4257C83001D58D6FAB1AF93AA227"
+" ipv6=[2605:6400:30:ea52:4246:fb82:f36c:8ede]:9000"
+/* nickname=Quetzalcoatl */
/* extrainfo=0 */
/* ===== */
,
-"213.164.218.224 orport=443 id=3C7F402F5C62A96C7E0DCD5CC850AADF88393802"
-/* nickname=Chani */
+"193.189.100.206 orport=443 id=876BA5C41AB7F4A8A99AACAB980C081DBA61711B"
+" ipv6=[2a0f:df00:0:255::206]:443"
+/* nickname=TORKeFFORG13 */
/* extrainfo=0 */
/* ===== */
,
-"51.83.131.42 orport=9001 id=8F293A6484A0973167B15C4997AB9F24C21143FE"
-/* nickname=Hydra24 */
+"185.207.107.216 orport=9100 id=B6D8110B34BD401ADF85B7AD0725C445C55EB65B"
+" ipv6=[2a03:4000:1e:7d4:84fb:5fff:fef3:9d56]:9100"
+/* nickname=Quetzalcoatl */
/* extrainfo=0 */
/* ===== */
,
-"172.105.89.143 orport=9007 id=26C15ED5282382A843D0774F5170BCCCCCC46D63"
-" ipv6=[2a01:7e01::f03c:92ff:fe7c:85f7]:9007"
-/* nickname=BestofbestBackup */
+"192.9.137.61 orport=443 id=D625533D56E1349296A09091D8E35AB0ED80CFB8"
+/* nickname=faraday */
/* extrainfo=0 */
/* ===== */
,
-"179.43.169.20 orport=443 id=65E40F7EDD28E2CF28684E30E0BAB7706819CFC3"
-/* nickname=Fangio */
+"193.35.18.120 orport=9100 id=2E2C0287F70CC6B95F5131B1BDB131C2B30672D9"
+" ipv6=[2a05:dfc7:4128::1]:9100"
+/* nickname=prsv */
/* extrainfo=0 */
/* ===== */
,
-"174.89.83.82 orport=9001 id=C8705CB63A3D3060A649D9FA0514E7E60A1E1A2B"
-/* nickname=metM0r */
+"185.220.101.84 orport=9100 id=5DFA91BFA46FAB8C054C36839DF3910034E29995"
+/* nickname=CCCStuttgartBer */
/* extrainfo=0 */
/* ===== */
,
-"68.160.242.214 orport=9001 id=6111C6005AB56498BE5E35666B2522CEBE17D14E"
-/* nickname=jsRelay */
+"185.220.101.46 orport=10046 id=C218A910CEF43EF5E4B9FC9F2026A7DA3958D9F4"
+" ipv6=[2a0b:f4c2:2::46]:10046"
+/* nickname=ForPrivacyNET */
/* extrainfo=0 */
/* ===== */
,
-"144.76.216.252 orport=9001 id=6B88E20FEE8EB47F1A8E30207F327005C61A013D"
-" ipv6=[2a01:4f8:200:8261::b0]:9001"
-/* nickname=slacknet */
+"77.172.70.151 orport=9001 id=4E8FCF9D0C137BE95052B1A98DD317F5F9DB74A9"
+" ipv6=[2a02:a469:a88b:1:5a9c:fcff:fe04:34c2]:9050"
+/* nickname=bv0002w */
/* extrainfo=0 */
/* ===== */
,
-"209.141.54.168 orport=443 id=A66E5782FE6097D2824044466776FE912AEFD85B"
-" ipv6=[2605:6400:20:274::1]:443"
-/* nickname=alxu2 */
+"23.129.64.220 orport=443 id=39150D8F6E5661F70F549C50F8222851C216D8CF"
+" ipv6=[2620:18c:0:192::220]:443"
+/* nickname=EO */
/* extrainfo=0 */
/* ===== */
,
-"107.189.31.241 orport=9100 id=82CE42D04B5BA616E611E4758861C864B2ACFCA8"
-" ipv6=[2605:6400:30:f02a:faff:1d57:32b7:157f]:9100"
-/* nickname=Quetzalcoatl */
+"46.101.178.190 orport=9001 id=7505737E6B273108BA0513902EC1DAAFAF88FE84"
+/* nickname=AmirTaaki4President */
/* extrainfo=0 */
/* ===== */
,
-"123.255.62.137 orport=9001 id=803FB98BA0FE1709C087E9138CC6096F22083CA5"
-/* nickname=Damnation */
+"78.130.174.8 orport=9001 id=CCF520E282B27180EF056A0F389D0846FBB45D7C"
+/* nickname=Neo2SHYAlien */
/* extrainfo=0 */
/* ===== */
,
-"5.56.221.113 orport=4020 id=605EE4375EE4C38215C8949F5808863749FD4F4A"
-/* nickname=arcanum */
+"171.25.193.79 orport=80 id=D416F7C8D83CAD913F3E09320014170D54FE6AA0"
+" ipv6=[2001:67c:289c:4::80]:80"
+/* nickname=DFRI20 */
/* extrainfo=0 */
/* ===== */
,
-"24.151.37.55 orport=42069 id=343EC037D633150AFFCC8471E805AABAE1B1D871"
-/* nickname=BringMeToLife */
+"148.251.136.16 orport=9100 id=916DC3199F639168CD20AEC4D45969268E807699"
+" ipv6=[2a01:4f8:210:400f::2]:9100"
+/* nickname=defcon777 */
/* extrainfo=0 */
/* ===== */
,
-"212.74.233.22 orport=9011 id=66B06D59BDFC90EBC6EDE79C558275F2CD4799B0"
-/* nickname=daytoner */
+"179.43.141.195 orport=9001 id=9BB6B6855BFFB7B2C628B4C8611C87A9B6CF8E79"
+/* nickname=pellirin */
/* extrainfo=0 */
/* ===== */
,
-"185.32.221.201 orport=443 id=03DC081E4409631006EFCD3AF13AFAAF2B553FFC"
-/* nickname=krigernes */
+"46.226.107.215 orport=10400 id=17A1BA65F89657B35EAF718C46A2073E0A3AE03E"
+" ipv6=[2001:4b98:dc0:43:f816:3eff:fe93:b598]:10400"
+/* nickname=bereg */
/* extrainfo=0 */
/* ===== */
,
-"199.249.230.166 orport=443 id=1BBCAEB763CA46DEB565A7251FAA6AC79A388ADD"
-" ipv6=[2620:7:6001::166]:80"
-/* nickname=Quintex77 */
+"206.217.136.47 orport=443 id=8696DC7AC0470F6ED5C7AC48030002D7D3716FC9"
+/* nickname=TakTor01 */
/* extrainfo=0 */
/* ===== */
,
-"92.38.163.65 orport=9001 id=C8AAADD3FD1470E7D60D8BC4500F95825F35057D"
-" ipv6=[2a03:90c0:83:2908::169]:443"
-/* nickname=Lux4 */
+"45.125.65.112 orport=9001 id=163C07F42EB06B65410E82A0AB1D14DEDD826C0F"
+/* nickname=theqube */
/* extrainfo=0 */
/* ===== */
,
-"193.111.26.37 orport=443 id=C9D02B1644BD47C136E379FDFAF4973D1A1CE07C"
-/* nickname=8af34cb1 */
+"199.249.230.66 orport=443 id=1E5136DDC52FAE1219208F0A6BADB0BA62587EE6"
+" ipv6=[2620:7:6001::ffff:c759:e642]:80"
+/* nickname=Quintex43 */
/* extrainfo=0 */
/* ===== */
,
-"132.226.162.148 orport=9001 id=45047C78E1F5E7B775B0A42F118D4ED64504D09E"
-" ipv6=[2603:c021:c003:3511:1::]:9001"
-/* nickname=plithismos */
+"207.244.234.242 orport=9999 id=EF2DEDD9B58C39AC62E7859F5C9033AC7785DBD0"
+" ipv6=[2605:a140:3009:4822::1]:9999"
+/* nickname=Wunderbaer2 */
/* extrainfo=0 */
/* ===== */
,
-"185.220.102.250 orport=993 id=35B503FB546815CC9EDE91022555B5D0ED04E389"
-" ipv6=[2a0b:f4c1:2::250]:993"
-/* nickname=Digitalcourage4ip3b */
+"172.241.224.145 orport=443 id=8CD3F8019FAFAC6D18C56E51DD143D8794E08D4D"
+/* nickname=StJames */
/* extrainfo=0 */
/* ===== */
,
-"95.216.145.127 orport=9001 id=5EF0AAAEEE7B1282DA0DBAB94669B73E39DD51B6"
-/* nickname=MyCoolNick */
+"195.90.201.209 orport=443 id=7A2D44E76934D709CBF0E0AE8FEB132B61B6F35D"
+" ipv6=[2a00:6800:3:33::4]:443"
+/* nickname=zensursula */
/* extrainfo=0 */
/* ===== */
,
-"84.160.69.190 orport=9001 id=1388AB40396F57ED95BB6036E6504CE8E0F622B8"
-/* nickname=BurnerMeetsTOR */
+"45.138.16.107 orport=8100 id=34CA0E8F7838FCC9984C7BAA282884A4F843A423"
+/* nickname=Quetzalcoatl */
/* extrainfo=0 */
/* ===== */
,
-"178.17.173.26 orport=9001 id=7332A06B00D6AF54AA804F03C624DFBBC9E66172"
-" ipv6=[2a00:1dc0:2451:10::3]:9001"
-/* nickname=MoldEraTor */
+"172.241.23.114 orport=443 id=57D0B5A215824CF1A7414DE61B6559C09526759F"
+/* nickname=chuckles */
/* extrainfo=0 */
/* ===== */
,
-"172.222.102.43 orport=9001 id=C8A8423DDB3C7E62D0F2A7A88B09BA68710B6AF2"
-/* nickname=margate */
+"185.67.45.99 orport=9001 id=5BA3C23E8A7F45FA2A7D1D280FF8AB788A5EA01B"
+/* nickname=clubflower */
/* extrainfo=0 */
/* ===== */
,
-"5.45.104.171 orport=22 id=D30734EC319A37E15155F6B710E9CC8F987FC772"
-" ipv6=[2a03:4000:6:1547:92dc:911c:7899:e0f2]:22"
-/* nickname=Unnamed */
+"38.147.122.250 orport=443 id=B31A677A74A47621BC6073AC32066F85F3033594"
+/* nickname=QuantumOnion250 */
/* extrainfo=0 */
/* ===== */
,
-"37.120.184.36 orport=9001 id=A7317673B923B591066204FFD299AB2C4150B6BE"
-" ipv6=[2a03:4000:f:512:8475:54ff:fefe:912d]:9001"
-/* nickname=Piratenpartei12 */
+"171.25.193.77 orport=81 id=55C7E10033F0E2E5F1D2838530CFB9B04D4F3B15"
+" ipv6=[2001:67c:289c:4::77]:81"
+/* nickname=DFRI30 */
/* extrainfo=0 */
/* ===== */
,
-"173.208.141.58 orport=8443 id=8D3BF2751B2C7857839B2E597EB9E092FB583506"
-" ipv6=[2604:4300:a:5b:bad:babe:ca11:911]:8443"
-/* nickname=c0rexxxkratos */
+"71.191.135.179 orport=1111 id=E2DE38FDE7B22FA934D5F2A15068DD078EE26F2A"
+/* nickname=daNickname */
/* extrainfo=0 */
/* ===== */
,
-"62.65.40.250 orport=443 id=6009023303F6881419F4CEDFC4B7FF8FFDF2E3C3"
-/* nickname=a2704f1ae50d753145e */
+"217.76.159.216 orport=443 id=D7B3558020235C1F374EEC8BDE1468E195411E3A"
+" ipv6=[2001:ba0:1800:fe::1]:443"
+/* nickname=Platypus */
/* extrainfo=0 */
/* ===== */
,
-"91.143.85.52 orport=465 id=FA85FE81093FE5D53DDCEA2DBA286E8CCC9C6DDD"
-" ipv6=[2a02:180:6:1::2efe]:465"
-/* nickname=Planetclaire64 */
+"185.220.103.115 orport=443 id=29D245A6831839CBD12CF61B6BD6AC4F0461BFAD"
+/* nickname=psychopomp8 */
/* extrainfo=0 */
/* ===== */
,
-"37.218.241.28 orport=9001 id=14D2FDC6ABDCD1A27CA32D13AA2C68566D1E8223"
-/* nickname=OONITestHelper */
+"185.241.208.202 orport=9200 id=64163502DFDE9A8BCA73B525170F484DFA703727"
+/* nickname=Aramis */
/* extrainfo=0 */
/* ===== */
,
-"163.172.94.119 orport=9001 id=E459E02374D0385D2E2515CBBE707EA208966BCF"
-" ipv6=[2001:bc8:208a::1]:9050"
-/* nickname=AsiaArgento */
+"81.16.33.38 orport=443 id=83CC2E5811087BF7DB73F8C2F331FCF1AB9FFD55"
+/* nickname=eclipse16 */
/* extrainfo=0 */
/* ===== */
,
-"91.121.82.132 orport=9001 id=87D28EE0C993B250EF93DBE4D2CB0E30244D757C"
-/* nickname=Hack2G2 */
+"185.104.194.129 orport=443 id=03CB58CC506894147FFABAF43F6A84C52BDFCECA"
+/* nickname=lewandowsky */
/* extrainfo=0 */
/* ===== */
,
-"62.210.123.24 orport=443 id=2EB3C230180694A1E848001E20F36F76A2287039"
-" ipv6=[2001:bc8:30c6:100::dead]:443"
-/* nickname=Alastor */
+"45.141.215.62 orport=9000 id=C71784391F1DA256250C03F7ACBD4801D0344BB3"
+/* nickname=Quetzalcoatl */
/* extrainfo=0 */
/* ===== */
,
-"192.222.169.71 orport=9001 id=B5B666F5F7E910DFF44AD58CD62A4B3F415ECB60"
-/* nickname=TORRelayCAN */
+"77.164.201.110 orport=9001 id=6F230469A5D07CF24361A4546E709AE52C6EBE4F"
+/* nickname=UniFiNode */
/* extrainfo=0 */
/* ===== */
,
-"95.217.30.201 orport=443 id=E7A3DA42BCA86430F089DD32C3FDA33534E76F19"
-" ipv6=[2a01:4f9:c01f:30::1]:443"
-/* nickname=waveguide01 */
+"91.199.41.47 orport=443 id=44D7EE0319437402932DF9CEC14727AC377BA29C"
+/* nickname=NCC1701 */
/* extrainfo=0 */
/* ===== */
,
-"51.159.144.243 orport=443 id=32364BEF873944BE481E8BCC7FAE9297F5F39781"
-/* nickname=tirz */
+"50.230.231.84 orport=80 id=BD815C93E9D87FFB32206C3540BD8559003D3325"
+" ipv6=[2001:559:327:231::84]:80"
+/* nickname=defconrelay2 */
/* extrainfo=0 */
/* ===== */
,
-"212.227.165.251 orport=9001 id=083C52051140DB8AF770BD40C7C8883EFFF4CAF3"
-/* nickname=NAKAM */
+"45.86.86.165 orport=443 id=806778E173CC7111767B89CA5F34CAF197E6CB3A"
+/* nickname=relay2 */
/* extrainfo=0 */
/* ===== */
,
-"93.95.88.13 orport=9001 id=4B1730254163346F434DE185BBA51B62D9074FC4"
-" ipv6=[2a02:2780::e01a]:9001"
-/* nickname=ZXSpectrum */
+"50.21.186.234 orport=9003 id=CDE81FC01501D4D9D0B07A7314C14F4A36958C2D"
+/* nickname=QECs01m03 */
/* extrainfo=0 */
/* ===== */
,
-"104.244.72.168 orport=9100 id=CDF6AECEA9A9092CA9859A78652AE60D359A44F6"
-" ipv6=[2605:6400:30:fb03:b137:4c52:b2b1:2c98]:9100"
-/* nickname=Quetzalcoatl */
+"82.65.165.202 orport=9443 id=2308791B415A970E410230D51BAED66B27C1ABBB"
+/* nickname=doudoubridge */
/* extrainfo=0 */
/* ===== */
,
-"198.73.50.66 orport=443 id=1CAFE6E87EE8BBA354DC5647C6E183D8B8AF20EC"
-/* nickname=KaplanCS6 */
+"195.201.202.19 orport=9001 id=CA180620A33507B8233B90868EA5EED2A3426040"
+" ipv6=[2a01:4f8:13a:2008::2]:9001"
+/* nickname=kottos */
/* extrainfo=0 */
/* ===== */
,
-"209.141.38.62 orport=443 id=60B2A557B6B9FB8CBF8168AA93FD24D8CCE815D7"
-/* nickname=ElectricSoda */
+"192.160.102.164 orport=9001 id=823AA81E277F366505545522CEDC2F529CE4DC3F"
+/* nickname=snowfall */
/* extrainfo=0 */
/* ===== */
,
-"109.236.86.109 orport=110 id=768B488AE2C61B6FA837E3AB8DB7601E1A0B8492"
-" ipv6=[2a00:7c80:0:1b0:a11:90d5:be:11e5]:110"
-/* nickname=eludemailrelay */
+"66.11.123.46 orport=9001 id=5580D6CB2F3E5878A5A5E6BB21AFB3083A883902"
+" ipv6=[2602:ffc5:105:301::1ec5:b9b8]:9001"
+/* nickname=cowboy771 */
/* extrainfo=0 */
/* ===== */
,
-"192.42.116.161 orport=9001 id=C804BE8FB1C7C42D43C4A5E2039E77AA0FF3A8B4"
-" ipv6=[2001:67c:6ec:203:192:42:116:161]:9001"
-/* nickname=geefMvanjetje */
+"82.221.131.71 orport=443 id=038C30D2AD053147C91EFB1291527ED621D7D1B1"
+/* nickname=turnt */
/* extrainfo=0 */
/* ===== */
,
-"31.13.195.248 orport=443 id=7EF6E998564211FB86881FEA2627AA9119BD9842"
-/* nickname=MaiaAlston */
+"81.169.134.23 orport=443 id=87FE1FF823E8E1359D2EE80B9B31B3B358BEE212"
+" ipv6=[2a01:238:439a:1900:43d6:a3e4:9968:9811]:443"
+/* nickname=RightToInformation */
/* extrainfo=0 */
/* ===== */
,
-"37.191.195.28 orport=8443 id=BB004C7F4C5C9FAE5E001864537F89388444F572"
-/* nickname=Unnamed */
+"81.169.240.172 orport=9001 id=1FF0E521C5B2085760EF3A50D6AE40036A440F8D"
+/* nickname=thewatchtower */
/* extrainfo=0 */
/* ===== */
,
-"23.154.177.2 orport=443 id=2A0F47CE7E1C0B7DE6FF2B3AD05DB0E77A876D98"
-/* nickname=UnredactedManning */
+"192.18.128.35 orport=9001 id=474AB014C284803A9604F189777D20CAC112E1CD"
+/* nickname=AllHailEdSnowden */
/* extrainfo=0 */
/* ===== */
,
-"51.178.26.103 orport=443 id=FFF4E4F51077370085A339B1F81A02BF3C2F52C9"
-" ipv6=[2001:41d0:305:2100::8550]:443"
-/* nickname=corvuscorax */
+"85.214.38.105 orport=9001 id=198ABDB49C8C41FFDF7A3E8D7CE7B185F5750353"
+" ipv6=[2a01:238:4255:c100:4e90:2717:4cfb:4a91]:9001"
+/* nickname=tweinode1 */
/* extrainfo=0 */
/* ===== */
,
-"51.81.56.74 orport=443 id=A1A2924158198592C3E88CB0DF23C14D9FE64328"
-/* nickname=sandstorm */
+"91.207.60.48 orport=9001 id=EF6604B95A942F1C7AD807DF10F93B9E00C47A6B"
+/* nickname=flodder */
/* extrainfo=0 */
/* ===== */
,
-"195.154.133.124 orport=9001 id=288DA2F27E30BC73FC8A84367696C9DF6B4C1B90"
-/* nickname=Pleiv */
+"171.25.193.20 orport=443 id=0D967EACE42448A08E244366DF753BBFF611EB37"
+" ipv6=[2001:67c:289c::20]:443"
+/* nickname=DFRI13 */
/* extrainfo=0 */
/* ===== */
,
-"176.9.118.73 orport=9993 id=5F58E9417DF94A66529864FA1134635614958A44"
-/* nickname=ThereIsNoCowLvl */
+"198.16.70.10 orport=9001 id=8EE28EAF0874AF9B03EBBD79B5EB5059E2547355"
+/* nickname=Thalassa */
/* extrainfo=0 */
/* ===== */
,
-"79.196.30.109 orport=9005 id=23605ADE16298CA152CC62F0C7593B3EB57BD0F4"
-/* nickname=Nightosphere */
+"45.141.215.61 orport=8430 id=DD8256B69665D0888BDC12B8066C7D311488E05F"
+/* nickname=Quetzalcoatl */
/* extrainfo=0 */
/* ===== */
,
-"24.3.110.224 orport=443 id=C542D452D42DBD01A071D2DA1CE6EE15AF40F5C2"
-/* nickname=meatloaf229 */
+"217.234.237.127 orport=9001 id=74C4BF6EBACB4CCE7DB03CBEF8EED77463793DCB"
+/* nickname=Hypnos */
/* extrainfo=0 */
/* ===== */
,
-"78.94.141.180 orport=15827 id=503431F94FF8FB69F10AD59DE31F3B2C3449D990"
-" ipv6=[2001:470:704c::3]:15827"
-/* nickname=ParckwartEfatsum */
+"193.226.78.213 orport=9001 id=AAB6F8B03BCE2F7C1853E8AFFBEBB3392A143BF5"
+/* nickname=tonyTOR */
/* extrainfo=0 */
/* ===== */
,
-"45.129.3.215 orport=9002 id=A6D2C788EE9468127151A732C090674AEB0C220C"
-" ipv6=[2a00:b700::8:2bb]:9001"
-/* nickname=NameIsNotHere */
+"51.77.111.67 orport=443 id=66DFC51E724E38DDCB3AB67DDF4C0BB0F1F49C0B"
+" ipv6=[2001:41d0:801:1000::db0]:443"
+/* nickname=Seccom04 */
/* extrainfo=0 */
/* ===== */
,
-"94.212.41.237 orport=9001 id=AEB2339CC5507533E4BDF91CB53FA130A4A72DE7"
-/* nickname=KoenzkTorRelay1 */
+"46.226.106.182 orport=443 id=8D5392A1FE568211EF62CCAF257DAE584AA5CDA5"
+" ipv6=[2001:4b98:dc0:43:f816:3eff:fe49:506d]:443"
+/* nickname=portoloin */
/* extrainfo=0 */
/* ===== */
,
-"185.100.87.250 orport=9443 id=072E2883854ADA0C6B0FC1497544E529D9FD8373"
-" ipv6=[2a06:1700:0:12::1]:9443"
-/* nickname=artikel10buc02 */
+"185.225.69.91 orport=443 id=81A1D777C023EBB1DEE9E7FA8735629BA8F7497C"
+/* nickname=evudalhessempos */
/* extrainfo=0 */
/* ===== */
,
-"50.7.178.34 orport=443 id=40FAE4540CF4C126B1B15C0F5E048FDBD66E2D88"
-/* nickname=fennee */
+"185.227.68.78 orport=443 id=1137AB1F84EC2D52DFB1915717F14FF1A10EB392"
+/* nickname=giovanna */
/* extrainfo=0 */
/* ===== */
,
-"164.132.226.30 orport=22 id=0AC3C86BC9CA2A50C7762EF42ABC6D37575ACFFB"
-" ipv6=[2001:41d0:401:3100::7fda]:22"
-/* nickname=PieroV */
+"75.157.141.153 orport=9001 id=6A538552CE8BF12F8C8FADC30AD3AF23551D465D"
+/* nickname=lucy */
/* extrainfo=0 */
/* ===== */
,
-"193.218.118.62 orport=9001 id=FF7C2604EFEE8B5898FDE1145A4CA35C8E5E5607"
-" ipv6=[2a0f:e586:f:f::62]:9001"
-/* nickname=Hydra1 */
+"95.214.54.70 orport=8443 id=8B8E30B0A49EBEEF963D2A5AAC28F3BD3068ADEC"
+" ipv6=[2a03:cfc0:8000:7::5fd6:3646]:8443"
+/* nickname=bauruine */
/* extrainfo=0 */
/* ===== */
,
-"140.78.100.18 orport=5443 id=B65EBC8D596BBCAD0AF6092C733C00872959FD68"
-/* nickname=INSRelay18at5443 */
+"178.85.20.176 orport=443 id=BF2FE282AABD61867815C86EE40C6072D6E437DF"
+/* nickname=cded2 */
/* extrainfo=0 */
/* ===== */
,
-"95.217.15.17 orport=443 id=1A10F6E2BA45CA4A5EBAA6EF759FCBF4E8AFEEA8"
-" ipv6=[2a01:4f9:c010:7066::1]:443"
-/* nickname=bias */
+"5.44.101.190 orport=443 id=73A5A81688BD536BFBABE18630F5BD6306C9AC8E"
+" ipv6=[2a00:fa40:3aaa:1::9b30:deb0]:443"
+/* nickname=Freebird33 */
/* extrainfo=0 */
/* ===== */
,
-"107.189.28.100 orport=9100 id=EB3DA93B6FFFA699C1F2714C9E73FA813BB8F822"
-" ipv6=[2605:6400:30:f052:2387:1aef:e178:b3d7]:9100"
-/* nickname=Quetzalcoatl */
+"81.169.240.47 orport=9001 id=AAE015C6F13CF06DE8FD28DB90372BE55C8AA307"
+" ipv6=[2a01:238:43de:1a00:7fbf:f902:d7a7:4f2c]:9001"
+/* nickname=strator */
/* extrainfo=0 */
/* ===== */
,
-"77.21.74.43 orport=9001 id=2DACC26F1D3BA64F32EEB4185BAD696A88BA832D"
-/* nickname=just1small4relay */
+"199.249.230.187 orport=443 id=E3A491D490DC1C3832D7F68615EEB4508C857D8B"
+" ipv6=[2620:7:6001::187]:80"
+/* nickname=Quintex98 */
/* extrainfo=0 */
/* ===== */
,
-"185.220.103.117 orport=443 id=20BC2F515B5057D598CCC018705E0ECA918E0395"
-/* nickname=SpeedTest2 */
+"46.167.244.57 orport=9001 id=1F709E17E2D0F1ACA1A826561FDE581631E1B322"
+/* nickname=eclipse05 */
/* extrainfo=0 */
/* ===== */
,
-"172.86.75.174 orport=443 id=101EEFBFCEC4869BA96C0E6AD2B6BBE696D98477"
-/* nickname=JumpOverAlice */
+"23.129.64.134 orport=443 id=AC28D573C16BD0C7D42AA70976BF36984A1E4DE0"
+" ipv6=[2620:18c:0:192::134]:443"
+/* nickname=lattera */
/* extrainfo=0 */
/* ===== */
,
-"51.15.249.137 orport=9030 id=75FB9A4469199F251581061391214ACFDC682EF4"
-/* nickname=NervousEnergy */
+"185.217.0.96 orport=443 id=8A62312A7766B398478C80A4B4D3831A9628E00E"
+/* nickname=taipe */
/* extrainfo=0 */
/* ===== */
,
-"96.244.79.89 orport=9001 id=ECB5CA114939B51E447792259F467C7D005C0693"
-/* nickname=luigi */
+"173.212.231.228 orport=9001 id=55403B9653A81F68C39787E000BD9F97E1F3B250"
+/* nickname=StriveForFreedom */
/* extrainfo=0 */
/* ===== */
,
-"213.73.96.131 orport=443 id=EE3DDF00C1ADC567F333B9BA819C8F252A32933C"
-/* nickname=gina */
+"193.200.241.189 orport=9001 id=A271A48CDCA2F6282F1405E4B5ED9E03C511B7E7"
+" ipv6=[2a02:c205:3007:4389::1]:9001"
+/* nickname=MPW */
/* extrainfo=0 */
/* ===== */
,
-"132.252.186.185 orport=443 id=8ABC4D5F6182C7E79B087D1ED9E5CF652C83E52C"
-" ipv6=[2001:638:501:4185:250:56ff:fe85:7034]:443"
-/* nickname=UDEtor */
+"62.182.84.146 orport=443 id=AAA2822835CE85D0C623134AFF01093947D73176"
+/* nickname=judoka */
/* extrainfo=0 */
/* ===== */
,
-"62.212.239.170 orport=80 id=4FC02CB4A624CE730FC4BDCBF60911913C45CEBD"
-/* nickname=thebolt */
+"5.255.99.5 orport=9001 id=D698261BC1B4A80E24BD050909552C7FE9464CD2"
+" ipv6=[2a04:52c0:104:ad97::1]:9001"
+/* nickname=Unnamed */
/* extrainfo=0 */
/* ===== */
,
-"92.223.72.168 orport=443 id=29FFA7A881ABADCA4EEEDD16128537BB028D5153"
-/* nickname=nati */
+"89.58.54.129 orport=853 id=255CC3EA8DB03A9E45EAA7D2CE8A05A4F26F0457"
+" ipv6=[2a03:4000:69:e40::1]:853"
+/* nickname=TorRelay1c */
/* extrainfo=0 */
/* ===== */
,
-"51.254.136.195 orport=443 id=7BB70F8585DFC27E75D692970C0EEB0F22983A63"
-/* nickname=torproxy02 */
+"80.67.167.81 orport=4443 id=5450CC0E3D08BB001E8229B8990323D11BC63332"
+" ipv6=[2a0e:e701:1198::1]:4443"
+/* nickname=arecoque3 */
/* extrainfo=0 */
/* ===== */
,
-"83.212.72.189 orport=443 id=661E08534FABDBE09BA505F7A73848371C6EF732"
-" ipv6=[2001:648:2ffe:501:cc00:11ff:fe4b:4ba5]:443"
-/* nickname=ExwMiaTigriMesaMou */
+"51.83.217.244 orport=9001 id=A4EB2E9D90D02F329D83C6909DBEBADAA721516F"
+/* nickname=racisz */
/* extrainfo=0 */
/* ===== */
,
-"84.113.179.53 orport=9001 id=8D870EED74A4305EEAC5E8CD09F2736837367B12"
-/* nickname=strainerraspi2tor */
+"80.151.36.96 orport=9001 id=F2D6EB211744D41DC41CCB62BF1C3246D24B42A2"
+" ipv6=[2003:a:1504:6000:a03a:d1ff:fea1:8062]:9001"
+/* nickname=anong33 */
/* extrainfo=0 */
/* ===== */
,
-"125.212.220.60 orport=443 id=CF773DE0B4F537BB80DA35643299403B7BF11AFA"
-/* nickname=lader */
+"88.99.248.158 orport=9001 id=5C80CB557C96CAD80EF8EC6AB55865329DF74B1B"
+" ipv6=[2a01:4f8:10b:670::2]:9001"
+/* nickname=Droutnutch */
/* extrainfo=0 */
/* ===== */
,
-"192.184.145.106 orport=9001 id=8B0D560D2867ADB8CD443ACABD054BEBF831F3D4"
-/* nickname=piftopp */
+"185.220.101.33 orport=10033 id=E49F3696DC13946A68DF2AAA6EDA460BC15D8F03"
+" ipv6=[2a0b:f4c2:2::33]:10033"
+/* nickname=ForPrivacyNET */
/* extrainfo=0 */
/* ===== */
,
-"104.244.72.65 orport=9001 id=F2DCADFB285DBAD7218E0EFA0598715DBAA8C18D"
-/* nickname=Hydra64 */
+"45.141.215.90 orport=9100 id=DB6005514696BFBBB8B59EE78A53D33B591DEE58"
+/* nickname=Quetzalcoatl */
/* extrainfo=0 */
/* ===== */
,
@@ -749,329 +754,342 @@
/* extrainfo=0 */
/* ===== */
,
-"206.217.136.47 orport=443 id=8696DC7AC0470F6ED5C7AC48030002D7D3716FC9"
-/* nickname=TakTor01 */
+"185.241.208.236 orport=9000 id=5D98A8A2F60F26C65E34F4205BE77219E10EFB09"
+/* nickname=Quetzalcoatl */
/* extrainfo=0 */
/* ===== */
,
-"185.65.206.154 orport=443 id=3BB47BFF2788B534A5BACA37879C48EEBE5E8800"
-/* nickname=laruneheureuse */
+"45.141.215.235 orport=110 id=99B6E09CF6084DB3A0D77BC0CFB1C6FC3B65A341"
+/* nickname=Quetzalcoatl */
/* extrainfo=0 */
/* ===== */
,
-"142.4.213.105 orport=443 id=082A6032BD1BB3C95F8DA9F1761F56C21297B2FC"
-/* nickname=Unnamed */
+"23.135.248.226 orport=443 id=D7F6418258F77E968E6DD0913045CF25A6548318"
+/* nickname=DarkdotCA2 */
/* extrainfo=0 */
/* ===== */
,
-"37.221.67.70 orport=9001 id=E9EF002E8D2911AFAB1121EF281858484F3ECA73"
-/* nickname=Bastion */
+"159.65.125.72 orport=9001 id=4B0E7A0210A75278C4058A6F947369EBF27791A3"
+/* nickname=CatButler */
/* extrainfo=0 */
/* ===== */
,
-"212.47.237.127 orport=9001 id=38EF2FCFE72C49C634FE082D6CAB5D8F423B4626"
-/* nickname=KonjikiNoYami */
+"91.126.217.153 orport=9001 id=F52611DA7E1EE1434C8B45368D0872C437A02958"
+/* nickname=elhackernet */
/* extrainfo=0 */
/* ===== */
,
-"54.36.108.162 orport=443 id=46F9FB943917858F618F2648595DEACD931D4400"
-/* nickname=runesandrelics */
+"131.153.152.170 orport=443 id=00EEFC60C571929282A0FEBB909D5893BE03787C"
+/* nickname=puppetshow */
/* extrainfo=0 */
/* ===== */
,
-"158.255.215.41 orport=7654 id=AF2E60DEEA9971F6956A46CE0B6BC94EF558240E"
-/* nickname=saturna */
+"185.243.218.61 orport=9001 id=8E1CB2E2467989A9369284E09669AD0FD691075E"
+" ipv6=[2a03:94e0:24d4::2]:9001"
+/* nickname=4716 */
/* extrainfo=0 */
/* ===== */
,
-"157.131.206.89 orport=443 id=CF4DB0E0480FEB1E8F59C3D774EB9275283D579D"
-/* nickname=GreetingsFromTheNet */
+"185.220.101.198 orport=443 id=E7467371A0C061A64A9AF943F530F253D54333EB"
+" ipv6=[2a0b:f4c2:2:1::198]:443"
+/* nickname=ForPrivacyNET */
/* extrainfo=0 */
/* ===== */
,
-"138.201.196.156 orport=9001 id=629DE11D15B760521E1391B2D0722698FDC103DF"
-" ipv6=[2a01:4f8:172:3e5b::2]:9001"
-/* nickname=pilatus */
+"31.170.22.199 orport=80 id=4E5B4306A183F233908DD699C0D734A81EC28669"
+/* nickname=ekodomik */
/* extrainfo=0 */
/* ===== */
,
-"45.61.185.90 orport=9000 id=098F98538A21A16332E8C4B724305C2A3496A467"
-" ipv6=[2605:6400:40:febd:48d8:7117:124f:cc45]:9000"
-/* nickname=Quetzalcoatl */
+"174.128.250.163 orport=443 id=F7A052D4EEA2F4BC942DFB054AF2DC54A2A37E5D"
+/* nickname=rockstars1 */
/* extrainfo=0 */
/* ===== */
,
-"194.145.150.15 orport=443 id=326853AA78DA467E997E6040ADD0DCFF840E0CB5"
-" ipv6=[2001:1578:200:10::c]:443"
-/* nickname=Unnamed */
+"193.35.18.95 orport=9000 id=F29505C049D997B8ABEEAEC5DAE58707D35C6729"
+" ipv6=[2a05:dfc7:40b8::1]:9000"
+/* nickname=prsv */
/* extrainfo=0 */
/* ===== */
,
-"95.216.115.85 orport=443 id=22BCD0DFD148209C9860C7F89907AB4DEE974A08"
-/* nickname=Fastnet */
+"51.15.114.49 orport=443 id=E166AA0BC0F97C25EF02193D3979442A82836512"
+/* nickname=tirz */
/* extrainfo=0 */
/* ===== */
,
-"134.249.106.21 orport=9001 id=5F6B1DF8C9FA561EC11670C455A4A9188D7F96D9"
-/* nickname=tr297e2 */
+"51.81.93.162 orport=443 id=18474F89EC3E8ABE40148B424C8DD5399242CEC1"
+/* nickname=squid */
/* extrainfo=0 */
/* ===== */
,
-"58.185.69.242 orport=8443 id=DF6F2B91C93270771C8EC92D243A7CB6234244A1"
-/* nickname=orangepeel */
+"81.226.199.193 orport=39062 id=1E7FE364A814340CBD79AA2B3365E718D3B1A67C"
+/* nickname=bambam */
/* extrainfo=0 */
/* ===== */
,
-"46.23.72.81 orport=443 id=7737A40305131AD8B5E60CFB9126E4BBE1ED7F76"
-/* nickname=frankovich */
+"185.220.101.85 orport=9000 id=16AC44F46A340FF41B18440B68601D6C33DE230D"
+/* nickname=CCCStuttgartBer */
/* extrainfo=0 */
/* ===== */
,
-"134.209.224.96 orport=443 id=736CD23D364941A7C23DE00FD21E44D16B50F388"
-/* nickname=Unnamed */
+"135.181.67.210 orport=443 id=DC7E7D9AB7AD52F03B856E6DC278E9D92BF19B33"
+" ipv6=[2a01:4f9:4b:4e97::6666]:443"
+/* nickname=s6tor2 */
/* extrainfo=0 */
/* ===== */
,
-"103.228.53.155 orport=9001 id=01CB2E297A8F586DBBCF98F028A3D1A49B0AB7BA"
-/* nickname=Overjump */
+"91.135.7.214 orport=9100 id=49D13F9940F1548219C4094AEF263995D616C875"
+" ipv6=[2a02:390:9854:40:8c84:91ff:fe56:1a76]:9100"
+/* nickname=1337T0rN0d3 */
/* extrainfo=0 */
/* ===== */
,
-"213.65.114.38 orport=65187 id=AB0D440FFAE565EFCE7D0278A3E87DAE5FA29578"
-/* nickname=Belgarath4TOR1 */
+"74.123.97.26 orport=443 id=B23272B61E82199138D2A19B2500FC4EEA091718"
+/* nickname=AlarisPrime */
/* extrainfo=0 */
/* ===== */
,
-"140.78.100.29 orport=8443 id=73F34CDC592584C0519988E443E6FDFBA72C790B"
-/* nickname=INSRelay29at8443 */
+"88.80.184.11 orport=8443 id=31E3072BE2D7FEC5707F09C351612FE2B7AE48D5"
+" ipv6=[2a01:7e00::f03c:93ff:feae:4153]:8443"
+/* nickname=justAnotherTorNode */
/* extrainfo=0 */
/* ===== */
,
-"193.108.117.59 orport=9001 id=B00B6BA943600447CF72D58DB7A35B16754E43C8"
-/* nickname=MyTorNode */
+"144.217.4.166 orport=443 id=F6691E3EB7CAB3C876AAA885E6801B63DC998C39"
+/* nickname=anotherRelay */
/* extrainfo=0 */
/* ===== */
,
-"69.164.221.78 orport=443 id=E46979A3053D43ADF187463A6E4856C875BC8C89"
-" ipv6=[2600:3c03::f03c:91ff:fe70:357]:443"
-/* nickname=teller */
+"45.138.16.240 orport=143 id=546629936518214DCFCF784E875D0EBE52E0552D"
+/* nickname=Quetzalcoatl */
/* extrainfo=0 */
/* ===== */
,
-"188.138.33.233 orport=443 id=D80EA21626BFAE8044E4037FE765252E157E3586"
-/* nickname=bonjour1 */
+"45.41.204.203 orport=9001 id=0645A80A17909D33FAFB5548E8A10F80AB38E65E"
+" ipv6=[2602:fea7:e0c:13::7]:9001"
+/* nickname=lakeshoreCrypto007 */
/* extrainfo=0 */
/* ===== */
,
-"85.214.147.9 orport=443 id=0FDC9A7D60608123CF5432F6E25C6E4BC23E7938"
-/* nickname=SchweinfurtsTor2 */
+"194.147.140.103 orport=143 id=021325CC77E58EFAC09CC621E2E22C2809AF85C7"
+/* nickname=tor103IPConnectINFO */
/* extrainfo=0 */
/* ===== */
,
-"185.220.103.120 orport=443 id=9F0FEE115DF5A0E3F5A975378064D63EC21B4A19"
-/* nickname=SpeedTest8 */
+"92.200.232.46 orport=9001 id=7E6CB729778A5A3BF33333FC270614EA79895BC4"
+/* nickname=jl2238 */
/* extrainfo=0 */
/* ===== */
,
-"37.120.190.160 orport=9001 id=C1B513BB5E15A1887B6ADCA8C010630732FC389A"
-" ipv6=[2a03:4000:6:b39a::2]:9001"
-/* nickname=fiedlerRelay03 */
+"94.130.142.182 orport=8443 id=50B7C4F6C18A3E5FC1D4E2ECE6B7B316B29FB26C"
+" ipv6=[2a01:4f8:13b:2dab::2]:8443"
+/* nickname=ElonTusk */
/* extrainfo=0 */
/* ===== */
,
-"213.164.204.90 orport=9001 id=22C1314867920DA37001DAD1A63F1D5CABF9DB11"
-/* nickname=Hydra30 */
+"82.66.192.180 orport=9001 id=E546C96AEB2258BD0733949027E8F96156F6B290"
+/* nickname=Shrdlu1 */
/* extrainfo=0 */
/* ===== */
,
-"83.53.71.25 orport=9001 id=AC7CF877B281BFEF34733E142C2A6F647AC57D82"
-/* nickname=mitorip */
+"178.254.38.159 orport=9001 id=AB62ED1A87A54F4193FCEEC587CB991399FADFBD"
+/* nickname=C00010FFD00D */
/* extrainfo=0 */
/* ===== */
,
-"51.15.85.13 orport=3158 id=07C8367E5B7D178B899578578BFC111FB4DDF2EA"
-/* nickname=tdz */
+"185.103.135.20 orport=9002 id=1B471B9FD70BD4D9E46C4E8B5B5AE075D6E2DD17"
+/* nickname=CinemaField */
/* extrainfo=0 */
/* ===== */
,
-"104.37.193.102 orport=443 id=96CAA917F65BCD62CECD236F67652BFD7C69E52E"
-/* nickname=TorRelay01 */
+"185.101.139.172 orport=443 id=9CBD49371BDB88FB8FB278C25AE8A9F1DE1498EA"
+/* nickname=NightRelay */
/* extrainfo=0 */
/* ===== */
,
-"136.49.38.118 orport=443 id=EC0ABA811E4EB33DAD8BC8B7037D862BF4F3AA28"
-/* nickname=mortimerAtx */
+"185.243.218.89 orport=9443 id=8F391ADFED1AC375AF1DF50BE5C9763149C5CD7A"
+" ipv6=[2a03:94e0:242c:dead::1]:9443"
+/* nickname=bauruine */
/* extrainfo=0 */
/* ===== */
,
-"107.189.28.100 orport=9000 id=0A76C0A0A721DDBC324B705ADBFC95FD806AE855"
-" ipv6=[2605:6400:30:f052:2387:1aef:e178:b3d7]:9000"
-/* nickname=Quetzalcoatl */
+"185.220.102.243 orport=993 id=1E9B32A00C594B032597D8B6A1DF79B734531530"
+" ipv6=[2a0b:f4c1:2::243]:993"
+/* nickname=Digitalcourage4ipdb */
/* extrainfo=0 */
/* ===== */
,
-"151.32.131.255 orport=443 id=2B18524260FBF9DF47CABBC22E811E76B197395E"
-/* nickname=torrone */
+"45.135.167.11 orport=9001 id=AEC32E6F5A0CF431B59BB3EA189D0882BF75EA3E"
+/* nickname=Mustang */
/* extrainfo=0 */
/* ===== */
,
-"114.23.164.80 orport=9001 id=CB81BCFD44FC142616BB5983648BD8AF01930789"
-/* nickname=ss23voyager */
+"58.182.147.226 orport=9090 id=7374504711DDF4D210FEAA99A3BB69DF21B2C12E"
+/* nickname=localsite */
/* extrainfo=0 */
/* ===== */
,
-"209.141.59.180 orport=443 id=AE5B9D83AD2D7B5C10604E457ACC5E2DD9A6D81E"
-/* nickname=freedomisnotfree */
+"185.246.153.133 orport=443 id=CF649890789E889380FC8A50B9A008F6338C1DD6"
+" ipv6=[2a06:f901:1:100::3d3]:443"
+/* nickname=tvorobuwek */
/* extrainfo=0 */
/* ===== */
,
-"45.132.246.38 orport=9001 id=431702B3A68A6015F9955DD4FD0129175B43EA0F"
-" ipv6=[2a03:4000:48:182:74dd:c1ff:fea8:d21e]:9001"
-/* nickname=bituman */
+"146.0.36.21 orport=9003 id=32361A1EFDF684DAEDC8CA64843767A395F9EACE"
+/* nickname=Loukanikos */
/* extrainfo=0 */
/* ===== */
,
-"109.92.182.91 orport=9001 id=28FDCC237E83C4EF83376336DB960D11D49FA756"
-/* nickname=Unnamed */
+"193.105.134.150 orport=9001 id=1808CDA40FDEFE9F1A117F89477BADC882C08A63"
+/* nickname=ferrarizSchumacher */
/* extrainfo=0 */
/* ===== */
,
-"172.73.184.37 orport=443 id=11AEE567D24CDE680AC78BCD6EBAC36C50B3CF49"
-/* nickname=Mirage */
+"217.95.71.141 orport=9001 id=4721AFABDBE29512A47A998E683A3EEACD1446A7"
+/* nickname=TuxFury */
/* extrainfo=0 */
/* ===== */
,
-"95.154.25.167 orport=9001 id=AF475359500A11B48E11561CB282955DF7AA15D0"
-/* nickname=ramstor1 */
+"51.15.113.108 orport=443 id=40E82B3E7B9167BC2B8B8B94F8CC4F48317BDAC6"
+/* nickname=tirz */
/* extrainfo=0 */
/* ===== */
,
-"185.31.136.244 orport=8181 id=B2242163F681F77F93190663AC5F696ACF76C4FD"
-" ipv6=[2a00:bbe0:0:221f:9eb6:54ff:fea7:1b2d]:8181"
-/* nickname=torexit42 */
+"45.92.33.62 orport=9000 id=02C7A07B1214AA338A705EFCCA409D700F757201"
+/* nickname=kykeon */
/* extrainfo=0 */
/* ===== */
,
-"185.220.102.254 orport=993 id=D13692D97236C0B8E8E19EA2DD952B5C4F9010BB"
-" ipv6=[2a0b:f4c1:2::254]:993"
-/* nickname=Digitalcourage4ip7b */
+"82.223.1.192 orport=443 id=8257411C95B2B8367F13FE5ED4BEE4F574940556"
+" ipv6=[2001:ba0:1800:81ef::1]:443"
+/* nickname=ZwiebelRouter03 */
/* extrainfo=0 */
/* ===== */
,
-"40.122.165.48 orport=443 id=32C6B88EEBD4F6F5AA61F15952E8D88EAD7C67BE"
-/* nickname=AnonUS00 */
+"173.255.228.134 orport=110 id=4ED33415952FA52DB95411A1DA86663EC1B109B9"
+" ipv6=[2600:3c03::f03c:91ff:fedf:407b]:110"
+/* nickname=bedrock */
/* extrainfo=0 */
/* ===== */
,
-"176.9.1.211 orport=9001 id=D123C0F8F562804693C47D68C61786023B295E98"
-" ipv6=[2a01:4f8:141:31c2:5054:ff:fe00:ea09]:9001"
-/* nickname=bmwanon3 */
+"185.220.100.255 orport=9000 id=98F793C7320CE3C15A45353AFCC165747A40366D"
+" ipv6=[2a0b:f4c0:16c:1::1]:9000"
+/* nickname=F3Netze */
/* extrainfo=0 */
/* ===== */
,
-"162.212.158.82 orport=9201 id=CF8CC4763298F77FF64DAF340D26D1BBF3362C5B"
-/* nickname=Assange034us2 */
+"193.105.134.186 orport=9001 id=41E99188810DA80965A890D03572CA9F963E29C9"
+/* nickname=Kperry */
/* extrainfo=0 */
/* ===== */
,
-"146.59.45.119 orport=443 id=CE6A9A13BB16F845C531F72923AB5D72C2C91848"
-/* nickname=morgana */
+"51.15.78.0 orport=9001 id=15BE17C99FACE24470D40AF782D6A9C692AB36D6"
+/* nickname=rofltor07 */
/* extrainfo=0 */
/* ===== */
,
-"107.189.6.61 orport=9100 id=46BFF98FBD77441B28A345DFCF0F11F70EB4A4B9"
-" ipv6=[2605:6400:30:f00f:1854:a31c:7871:2582]:9100"
-/* nickname=Quetzalcoatl */
+"199.249.230.154 orport=443 id=DA77AAFE0CC38DB958432B45910F47714D614AA8"
+" ipv6=[2620:7:6001::154]:80"
+/* nickname=Quintex65 */
/* extrainfo=0 */
/* ===== */
,
-"45.142.100.30 orport=443 id=A013BBF2E931A7D58A3707C84761B3F6AAAB25D5"
-" ipv6=[2a10:46c0:0:2::13]:443"
-/* nickname=siffeurattex */
+"18.18.82.18 orport=9001 id=BF54EE3193751481579BA7CC7D8E1DF0A01AFB30"
+/* nickname=gesdm */
/* extrainfo=0 */
/* ===== */
,
-"178.63.172.14 orport=443 id=0A178D302936F209AF3DA77CCC4E3C4D5DBE11E9"
-/* nickname=pusith */
+"205.185.117.232 orport=15698 id=8F892BBC4715AA201CECC8FE6316AFF5AD40C1F2"
+" ipv6=[2605:6400:20:19cb:dd92:af73:5b09:3e0a]:15698"
+/* nickname=PoohBear18645 */
/* extrainfo=0 */
/* ===== */
,
-"37.221.65.169 orport=8443 id=39A18F31B312E5CB211781090766934C1CFDAB36"
-" ipv6=[2001:678:6d4:6010::3aed:102]:8443"
-/* nickname=Aramis66 */
+"185.100.87.41 orport=443 id=D4991BF14BF7D4BB684E56AB02A44A6CA6391606"
+" ipv6=[2a06:1700:0:3c::1]:443"
+/* nickname=cepa1 */
/* extrainfo=0 */
/* ===== */
,
-"64.44.51.37 orport=443 id=410F0781BCA296C866822A5D03A8D11F2457E78C"
-" ipv6=[2602:ffc8:1:7::bad]:443"
-/* nickname=torr1maiti */
+"199.195.251.54 orport=9001 id=E09782C5F119131D5DF3C77B83E3214697AB6376"
+/* nickname=dappertr */
/* extrainfo=0 */
/* ===== */
,
-"85.239.33.8 orport=9001 id=62F65E6377F0647CE0F0EE2AAE1641EC4AA2BD3B"
-/* nickname=Piplup */
+"192.42.116.186 orport=9003 id=B48ED936B2FF3A776A333AE8A81D464BEA8FF560"
+" ipv6=[2001:67c:6ec:203:192:42:116:186]:9003"
+/* nickname=NTH34R4 */
/* extrainfo=0 */
/* ===== */
,
-"185.239.222.253 orport=443 id=7238EAB91E1050B6C6BEDDFCFD7A2440869B114A"
-" ipv6=[2a09:2681:101:9001::14]:443"
-/* nickname=BM14 */
+"45.90.161.141 orport=9100 id=61251D3B47F02345874BB7F2B4D6EF319814DE34"
+" ipv6=[2a0c:8881::f05d:92ff:feb5:2932]:9100"
+/* nickname=prsv */
/* extrainfo=0 */
/* ===== */
,
-"162.247.74.213 orport=443 id=84D361B736A8CD1E8818D0FC186892E91AB76881"
-/* nickname=CalyxInstitute03 */
+"217.23.8.2 orport=9001 id=B42C797CC8CD63C60FB643E820A11D113DF4F5C8"
+/* nickname=firefly */
/* extrainfo=0 */
/* ===== */
,
-"51.81.160.187 orport=9001 id=F4DD04C48A6CB6DB36DF6381FFB42D5BFAD97501"
-/* nickname=FreedomRelay2 */
+"185.220.101.56 orport=10056 id=E0EC6DB18CA367FE6D8478D32D760346E1C43F15"
+" ipv6=[2a0b:f4c2:2::56]:10056"
+/* nickname=ForPrivacyNET */
/* extrainfo=0 */
/* ===== */
,
-"109.70.100.16 orport=443 id=B1045E12FA4EA0D457A74013866CB41DC0D290BF"
-" ipv6=[2a03:e600:100::16]:443"
-/* nickname=broccoli */
+"199.249.230.170 orport=443 id=A91F3E4D2CCD81F5C865E143525F92A790CDF17E"
+" ipv6=[2620:7:6001::170]:80"
+/* nickname=Quintex81 */
/* extrainfo=0 */
/* ===== */
,
-"104.152.209.130 orport=443 id=A4A79E2B8294AA2572B46C5C772E149F84FAF763"
-/* nickname=Shebangs */
+"95.238.36.153 orport=443 id=781A93C050EC58EEA685B750907CE753278F3811"
+/* nickname=ElDavo */
/* extrainfo=0 */
/* ===== */
,
-"213.227.133.129 orport=443 id=94318CC2299A3826D81899EB23C25A2B7D6B1FFE"
-/* nickname=byrdeman */
+"54.36.205.38 orport=9001 id=5DB9AE27A44EB7B476CC04A66C67A71C97A001E6"
+/* nickname=Chenjesu */
/* extrainfo=0 */
/* ===== */
,
-"54.36.101.21 orport=9001 id=D9C55AC5549BF4940BE0ABBBE0E34CCC8D6D06E5"
-/* nickname=ExiTOR */
+"195.123.212.228 orport=9001 id=950134F4ABA3291EEE4E7A2F26546DB7070776A4"
+" ipv6=[2a02:27ac::245]:9001"
+/* nickname=FakeVolleyball */
/* extrainfo=0 */
/* ===== */
,
-"104.244.76.13 orport=443 id=1C0D0AF3FF05CCBBA4B6ED262196A4C5A76102E6"
-/* nickname=SpongeBob */
+"212.227.43.225 orport=443 id=43E366E41D547A1D3F22FBED10250B6C57F848DA"
+" ipv6=[2001:ba0:1800:81a4::1]:443"
+/* nickname=ZwiebelRouter02 */
/* extrainfo=0 */
/* ===== */
,
-"49.12.93.240 orport=443 id=602A20F90E20D1B9EA4DD87AE948B590C61F8A94"
-/* nickname=skewed */
+"94.142.241.194 orport=9004 id=C03209F54BC299927CA7581147434F439F37CACB"
+" ipv6=[2a02:898:218::2]:9004"
+/* nickname=VrijHeid4 */
/* extrainfo=0 */
/* ===== */
,
-"37.59.37.59 orport=9001 id=B7E2EBFBE4462FC908E48007517C53ED0FF752B2"
+"193.201.15.78 orport=9001 id=315A3BBD94BA41F1CF53F809DC89599B9315C9EF"
/* nickname=Unnamed */
/* extrainfo=0 */
/* ===== */
,
-"140.78.100.25 orport=8443 id=9385FF13D9E3BAB934ABCBA61EE63E10346E3673"
-/* nickname=INSRelay25at8443 */
+"204.8.156.142 orport=443 id=94C4B7B8C50C86A92B6A20107539EE2678CF9A28"
+/* nickname=BostonUCompSci */
+/* extrainfo=0 */
+/* ===== */
+,
+"51.81.155.81 orport=9001 id=BB4BBDD4895E9481A8F16C311D22CC2BB7B1D6BF"
+/* nickname=ratap */
/* extrainfo=0 */
/* ===== */
,
-"185.220.103.118 orport=9000 id=3C84D97D9846044338D6DC013A6F62A9291F4614"
-/* nickname=SpeedTest5 */
+"86.105.195.106 orport=9001 id=6C89ED752860F279ABB2055B2B591A8669F3BBE2"
+/* nickname=sandbeast */
/* extrainfo=0 */
/* ===== */
,
diff --git a/src/app/config/or_options_st.h b/src/app/config/or_options_st.h
index 3a1acad044..624dc61bc5 100644
--- a/src/app/config/or_options_st.h
+++ b/src/app/config/or_options_st.h
@@ -141,6 +141,8 @@ struct or_options_t {
* Includes OutboundBindAddresses and
* configured ports. */
int ReducedExitPolicy; /**<Should we use the Reduced Exit Policy? */
+ int ReevaluateExitPolicy; /**<Should we re-evaluate Exit Policy on existing
+ * connections when it changes? */
struct config_line_t *SocksPolicy; /**< Lists of socks policy components */
struct config_line_t *DirPolicy; /**< Lists of dir policy components */
/** Local address to bind outbound sockets */
@@ -396,8 +398,6 @@ struct or_options_t {
/** List of suffixes for <b>AutomapHostsOnResolve</b>. The special value
* "." means "match everything." */
struct smartlist_t *AutomapHostsSuffixes;
- int RendPostPeriod; /**< How often do we post each rendezvous service
- * descriptor? Remember to publish them independently. */
int KeepalivePeriod; /**< How often do we send padding cells to keep
* connections alive? */
int SocksTimeout; /**< How long do we let a socks connection wait
@@ -601,6 +601,12 @@ struct or_options_t {
/** Boolean: Switch to toggle the vanguards-lite subsystem */
int VanguardsLiteEnabled;
+ /** Boolean: Switch to override consensus to enable congestion control */
+ int AlwaysCongestionControl;
+
+ /** Boolean: Switch to specify this is an sbws measurement exit */
+ int SbwsExit;
+
int RephistTrackTime; /**< How many seconds do we keep rephist info? */
/** Should we always fetch our dir info on the mirror schedule (which
* means directly from the authorities) no matter our other config? */
@@ -719,6 +725,19 @@ struct or_options_t {
* accessing this value directly. */
int ClientPreferIPv6DirPort;
+ /** If true, always use the compiled hash implementation. If false, always
+ * the interpreter. Default of "auto" allows a dynamic fallback from
+ * copmiler to interpreter. */
+ int CompiledProofOfWorkHash;
+
+ /** If true, the tor client will use conflux for its general purpose
+ * circuits which excludes onion service traffic. */
+ int ConfluxEnabled;
+
+ /** Has the UX integer value that the client will request from the exit. */
+ char *ConfluxClientUX_option;
+ int ConfluxClientUX;
+
/** The length of time that we think a consensus should be fresh. */
int V3AuthVotingInterval;
/** The length of time we think it will take to distribute votes. */
diff --git a/src/app/config/resolve_addr.c b/src/app/config/resolve_addr.c
index 09d4b800f6..130998b7c8 100644
--- a/src/app/config/resolve_addr.c
+++ b/src/app/config/resolve_addr.c
@@ -810,7 +810,7 @@ find_my_address(const or_options_t *options, int family, int warn_severity,
* want to learn here if the address is considered to come from the
* Internet basically.
*
- * @param addr The address to test if local and also test against our resovled
+ * @param addr The address to test if local and also test against our resolved
* address.
*
* @return True iff address is considered local or else False.
diff --git a/src/app/config/testnet.inc b/src/app/config/testnet.inc
index 039454a0d0..2774a4c8ea 100644
--- a/src/app/config/testnet.inc
+++ b/src/app/config/testnet.inc
@@ -30,5 +30,4 @@
{ "TestingDirConnectionMaxStall", "30 seconds" },
{ "TestingEnableConnBwEvent", "1" },
{ "TestingEnableCellStatsEvent", "1" },
-{ "RendPostPeriod", "2 minutes" },
{ "___UsingTestNetworkDefaults", "1" },
7apu2bq3rhoylwmucxizk54afw5jyda7pho4j5zdcqpwkufke7zdzwad.onion