summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog70
-rw-r--r--changes/bug402226
-rw-r--r--changes/bug40285_0454
-rw-r--r--changes/ticket-403313
-rw-r--r--changes/ticket403223
-rw-r--r--changes/ticket403232
-rw-r--r--changes/ticket403464
-rw-r--r--configure.ac4
-rw-r--r--contrib/win32build/tor-mingw.nsi.in2
-rw-r--r--doc/man/tor.1.txt70
-rw-r--r--src/core/or/dos.c3
-rw-r--r--src/core/or/status.c2
-rw-r--r--src/feature/stats/rephist.c10
-rw-r--r--src/test/test_stats.c20
-rw-r--r--src/test/test_status.c4
-rw-r--r--src/win32/orconfig.h2
16 files changed, 115 insertions, 94 deletions
diff --git a/ChangeLog b/ChangeLog
index a9d8df1566..646e0c8629 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,17 +14,24 @@ Changes in version 0.4.6.1-alpha - 2021-03-18
Neel Chauhan.
o Major features (directory authorityl):
- - When voting for a relay with a Sybil-like appearance, add the
- Sybil flag when clearing out the other flags. This lets a relay
- operator know why their relay hasn't been voted on. Closes ticket
- 40255. Patch by Neel Chauhan.
+ - When voting on a relay with a Sybil-like appearance, add the Sybil
+ flag when clearing out the other flags. This lets a relay operator
+ know why their relay hasn't been included in the consensus. Closes
+ ticket 40255. Patch by Neel Chauhan.
+
+ o Major features (metrics):
+ - Relays now report how overloaded they are in their extrainfo
+ documents. This information is controlled with the
+ OverloadStatistics torrc option, and it will be used to improve
+ decisions about the network's load balancing. Implements proposal
+ 328; closes ticket 40222.
o Major features (relay, denial of service):
- Add a new DoS subsystem feature to control the rate of client
connections for relays. Closes ticket 40253.
o Major features (statistics):
- - Relays now also publish statistics about the number of v3 onion
+ - Relays now publish statistics about the number of v3 onion
services and volume of v3 onion service traffic, in the same
manner they already do for v2 onions. Closes ticket 23126.
@@ -45,9 +52,9 @@ Changes in version 0.4.6.1-alpha - 2021-03-18
we alter our estimate Xm by taking the maximum of the top 10 most
common build time values of the 10ms histogram, and compute Xm as
the average of these. Fixes bug 40168; bugfix on 0.2.2.14-alpha.
- - Remove max_time calculation and associated warn from circuit build
- timeout 'alpha' parameter estimation, as this is no longer needed
- by our new estimator from 40168. Fixes bug 34088; bugfix
+ - Remove max_time calculation and associated warning from circuit
+ build timeout 'alpha' parameter estimation, as this is no longer
+ needed by our new estimator from 40168. Fixes bug 34088; bugfix
on 0.2.2.9-alpha.
o Major bugfixes (signing key):
@@ -78,22 +85,27 @@ Changes in version 0.4.6.1-alpha - 2021-03-18
relay fingerprint. Closes ticket 33632. Patch by Neel Chauhan.
o Minor features (control port, stream handling):
- - Add the stream ID argument to the event line in the ADDRMAP
- control event. Closes ticket 40249. Patch by Neel Chauhan.
+ - Add the stream ID to the event line in the ADDRMAP control event.
+ Closes ticket 40249. Patch by Neel Chauhan.
+
+ o Minor features (dormant mode):
+ - Add a new 'DormantTimeoutEnabled' option for coarse-grained
+ control over whether the client can become dormant from
+ inactivity. Most people won't need this. Closes ticket 40228.
o Minor features (logging):
- - Change the DoS subsystem heartbeat line format so be more clear on
- what has been detected/rejected and which option is disabled if
- any. Closes ticket 40308.
+ - Change the DoS subsystem heartbeat line format to be more clear on
+ what has been detected/rejected, and which option is disabled (if
+ any). Closes ticket 40308.
- In src/core/mainloop/mainloop.c and src/core/mainloop/connection.c,
put brackets around IPv6 addresses in log messages. Closes ticket
40232. Patch by Neel Chauhan.
o Minor features (performance, windows):
- Use SRWLocks to implement locking on Windows. Replaces the
- critical section locking implementation with the faster SRWLocks
- available since Windows Vista. Closes ticket 17927. Patch by
- Daniel Pinto.
+ "critical section" locking implementation with the faster
+ SRWLocks, available since Windows Vista. Closes ticket 17927.
+ Patch by Daniel Pinto.
o Minor features (protocol, proxy support, defense in depth):
- Close HAProxy connections if they somehow manage to send us data
@@ -106,20 +118,25 @@ Changes in version 0.4.6.1-alpha - 2021-03-18
o Minor features (vote document):
- Add a "stats" line to directory authority votes, to report various
- statistics that authorities computed about the relays. This will
+ statistics that authorities compute about the relays. This will
help us diagnose the network better. Closes ticket 40314.
o Minor bugfixes (build):
- - Mini-report in the configure script now shows whether or not lzma
- and zstd have been used, not just if enable flag passed in. Fixes
- bug 40236; bugfix on 0.4.3.1-alpha.
+ - The configure script now shows whether or not lzma and zstd have
+ been used, not just if the enable flag was passed in. Fixes bug
+ 40236; bugfix on 0.4.3.1-alpha.
o Minor bugfixes (compatibility):
- - Fix a failure in the test cases when running on the hppa
+ - Fix a failure in the test cases when running on the "hppa"
architecture, along with a related test that might fail on other
architectures in the future. Fixes bug 40274; bugfix
on 0.2.5.1-alpha.
+ o Minor bugfixes (controller):
+ - Fix a "BUG" warning that would appear when a controller chooses
+ the first hop for a circuit, and that circuit completes. Fixes bug
+ 40285; bugfix on 0.3.2.1-alpha.
+
o Minor bugfixes (directory authorities, voting):
- Add a new consensus method (31) to support any future changes that
authorities decide to make to the value of bwweightscale or
@@ -128,8 +145,8 @@ Changes in version 0.4.6.1-alpha - 2021-03-18
most circumstances. Fixes bug 19011; bugfix on 0.2.2.10-alpha.
o Minor bugfixes (ipv6):
- - Allow non-SOCKSPorts to disable IPv4, IPv6, and Prefer IPv4. Some
- rare configs might break, but in this case you can disable
+ - Allow non-SOCKSPorts to disable IPv4, IPv6, and PreferIPv4. Some
+ rare configurations might break, but in this case you can disable
NoIPv4Traffic and NoIPv6Traffic as needed. Fixes bug 33607; bugfix
on 0.4.1.1-alpha. Patch by Neel Chauhan.
@@ -146,15 +163,16 @@ Changes in version 0.4.6.1-alpha - 2021-03-18
o Minor bugfixes (relay):
- Reduce the compression level for data streaming from HIGH to LOW.
+ This should reduce the CPU and memory burden for directory caches.
Fixes bug 40301; bugfix on 0.3.5.1-alpha.
o Code simplification and refactoring:
- Remove the orconn_ext_or_id_map structure and related functions.
- Nothing outside of unit tests looks up anything in this structure.
- Closes ticket 33383. Patch by Neel Chauhan.
+ (Nothing outside of unit tests used them.) Closes ticket 33383.
+ Patch by Neel Chauhan.
o Code simplification and refactoring (metrics, DoS):
- - Move the DoS subsystem into the subsys manager including its
+ - Move the DoS subsystem into the subsys manager, including its
configuration options. Closes ticket 40261.
o Removed features (relay):
diff --git a/changes/bug40222 b/changes/bug40222
deleted file mode 100644
index 8338ea4a7b..0000000000
--- a/changes/bug40222
+++ /dev/null
@@ -1,6 +0,0 @@
- o Major features (metrics):
- - Introduce a new class of extra-info statistics that allows relays to
- expose details of how overloaded they are. This information is controlled
- using the OverloadStatistics torrc option, and it will be used to make
- more informed decisions about the network's load balancing. Implements
- proposal 328; closes ticket 40222.
diff --git a/changes/bug40285_045 b/changes/bug40285_045
deleted file mode 100644
index db4f73cde0..0000000000
--- a/changes/bug40285_045
+++ /dev/null
@@ -1,4 +0,0 @@
- o Minor bugfixes (controller):
- - Fix a "BUG" warning that would appear when a controller chooses the
- first hop for a circuit, and that circuit completes. Fixes
- bug 40285; bugfix on 0.3.2.1-alpha.
diff --git a/changes/ticket-40331 b/changes/ticket-40331
new file mode 100644
index 0000000000..c99d704c33
--- /dev/null
+++ b/changes/ticket-40331
@@ -0,0 +1,3 @@
+ o Documentation (doc/man/tor.1.txt) :
+ - Move the ServerTransport* options options to the SERVER OPTIONS` section .
+ Closes issue 40331.
diff --git a/changes/ticket40322 b/changes/ticket40322
new file mode 100644
index 0000000000..18a65b3323
--- /dev/null
+++ b/changes/ticket40322
@@ -0,0 +1,3 @@
+ o Minor features (logging):
+ - Edit heartbeat log messages so that more of them begin with the string
+ "Heartbeat: ". Closes ticket 40322; patch from 'cypherpunks'.
diff --git a/changes/ticket40323 b/changes/ticket40323
new file mode 100644
index 0000000000..83223b2f15
--- /dev/null
+++ b/changes/ticket40323
@@ -0,0 +1,2 @@
+ o Documentation (manual):
+ - Move the description of "BridgeRecordUsageByCountry" to the section "STATISTICS OPTIONS". Closes ticket 40323.
diff --git a/changes/ticket40346 b/changes/ticket40346
new file mode 100644
index 0000000000..c76e6d6aec
--- /dev/null
+++ b/changes/ticket40346
@@ -0,0 +1,4 @@
+ o Documentation (man, onion service):
+ - The HiddenServiceStatistics option also applies to bridges so properly
+ indicate that in the tor.1 man page. Closes ticket 40346.
+
diff --git a/configure.ac b/configure.ac
index c9023d8663..9649951503 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.6.1-alpha])
+AC_INIT([tor],[0.4.6.1-alpha-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, ["2021-03-15"], # for 0.4.6.1-alpha
+AC_DEFINE(APPROX_RELEASE_DATE, ["2021-03-18"], # for 0.4.6.1-alpha-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 0e5d54bd79..bc02570ce1 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.6.1-alpha"
+!define VERSION "0.4.6.1-alpha-dev"
!define INSTALLER "tor-${VERSION}-win32.exe"
!define WEBSITE "https://www.torproject.org/"
!define LICENSE "LICENSE"
diff --git a/doc/man/tor.1.txt b/doc/man/tor.1.txt
index a8436f7446..8761237aff 100644
--- a/doc/man/tor.1.txt
+++ b/doc/man/tor.1.txt
@@ -966,23 +966,6 @@ forward slash (/) in the configuration file and on the command line.
If KIST is used in Schedulers, this is a multiplier of the per-socket
limit calculation of the KIST algorithm. (Default: 1.0)
-
-[[ServerTransportListenAddr]] **ServerTransportListenAddr** __transport__ __IP__:__PORT__::
- When this option is set, Tor will suggest __IP__:__PORT__ as the
- listening address of any pluggable transport proxy that tries to
- launch __transport__. (IPv4 addresses should written as-is; IPv6
- addresses should be wrapped in square brackets.) (Default: none)
-
-[[ServerTransportOptions]] **ServerTransportOptions** __transport__ __k=v__ __k=v__ ...::
- When this option is set, Tor will pass the __k=v__ parameters to
- any pluggable transport proxy that tries to launch __transport__. +
- (Example: ServerTransportOptions obfs45 shared-secret=bridgepasswd cache=/var/lib/tor/cache) (Default: none)
-
-[[ServerTransportPlugin]] **ServerTransportPlugin** __transport__ exec __path-to-binary__ [options]::
- The Tor relay launches the pluggable transport proxy in __path-to-binary__
- using __options__ as its command-line options, and expects to receive
- proxied client traffic from it. (Default: none)
-
[[Socks4Proxy]] **Socks4Proxy** __host__[:__port__]::
Tor will make all OR connections through the SOCKS 4 proxy at host:port
(or host:1080 if port is not specified).
@@ -2203,13 +2186,14 @@ is non-zero):
(Default: "month 1 0:00")
[[Address]] **Address** __address__::
- The IPv4 address of this server, or a fully qualified domain name of
- this server that resolves to an IPv4 address. You can leave this
- unset, and Tor will try to guess your IPv4 address. This IPv4
- address is the one used to tell clients and other servers where to
- find your Tor server; it doesn't affect the address that your server
- binds to. To bind to a different address, use the ORPort and
- OutboundBindAddress options.
+ The address of this server, or a fully qualified domain name of this server
+ that resolves to an address. You can leave this unset, and Tor will try to
+ guess your address. If a domain name is provided, Tor will attempt to
+ resolve it and use the underlying IPv4/IPv6 address as its publish address
+ (taking precedence over the ORPort configuration). The publish address is
+ the one used to tell clients and other servers where to find your Tor
+ server; it doesn't affect the address that your server binds to. To bind
+ to a different address, use the ORPort and OutboundBindAddress options.
[[AddressDisableIPv6]] **AddressDisableIPv6** **0**|**1**::
By default, Tor will attempt to find the IPv6 of the relay if there is no
@@ -2238,21 +2222,13 @@ is non-zero):
relay is configured in bridge mode.
//Out of order because it logically belongs after BridgeRelay.
-[[BridgeRecordUsageByCountry]] **BridgeRecordUsageByCountry** **0**|**1**::
- When this option is enabled and BridgeRelay is also enabled, and we have
- GeoIP data, Tor keeps a per-country count of how many client
- addresses have contacted it so that it can help the bridge authority guess
- which countries have blocked access to it. If ExtraInfoStatistics is
- enabled, it will be published as part of the extra-info document.
- (Default: 1)
-
-//Out of order because it logically belongs after BridgeRelay.
[[BridgeDistribution]] **BridgeDistribution** __string__::
If set along with BridgeRelay, Tor will include a new line in its
bridge descriptor which indicates to the BridgeDB service how it
would like its bridge address to be given out. Set it to "none" if
you want BridgeDB to avoid distributing your bridge address, or "any" to
- let BridgeDB decide. (Default: any)
+ let BridgeDB decide. See https://bridges.torproject.org/info for a more
+ up-to-date list of options. (Default: any)
[[ContactInfo]] **ContactInfo** __email_address__::
Administrative contact information for this relay or bridge. This line
@@ -2675,6 +2651,22 @@ is non-zero):
name lookups that your server does on behalf of clients. (Default:
"www.google.com, www.mit.edu, www.yahoo.com, www.slashdot.org")
+[[ServerTransportListenAddr]] **ServerTransportListenAddr** __transport__ __IP__:__PORT__::
+ When this option is set, Tor will suggest __IP__:__PORT__ as the
+ listening address of any pluggable transport proxy that tries to
+ launch __transport__. (IPv4 addresses should written as-is; IPv6
+ addresses should be wrapped in square brackets.) (Default: none)
+
+[[ServerTransportOptions]] **ServerTransportOptions** __transport__ __k=v__ __k=v__ ...::
+ When this option is set, Tor will pass the __k=v__ parameters to
+ any pluggable transport proxy that tries to launch __transport__. +
+ (Example: ServerTransportOptions obfs45 shared-secret=bridgepasswd cache=/var/lib/tor/cache) (Default: none)
+
+[[ServerTransportPlugin]] **ServerTransportPlugin** __transport__ exec __path-to-binary__ [options]::
+ The Tor relay launches the pluggable transport proxy in __path-to-binary__
+ using __options__ as its command-line options, and expects to receive
+ proxied client traffic from it. (Default: none)
+
[[ShutdownWaitLength]] **ShutdownWaitLength** __NUM__::
When we get a SIGINT and we're a server, we begin shutting down:
we close listeners and start refusing new circuits. After **NUM**
@@ -2702,6 +2694,14 @@ Relays publish most statistics in a document called the
extra-info document. The following options affect the different
types of statistics that Tor relays collect and publish:
+[[BridgeRecordUsageByCountry]] **BridgeRecordUsageByCountry** **0**|**1**::
+ When this option is enabled and BridgeRelay is also enabled, and we have
+ GeoIP data, Tor keeps a per-country count of how many client
+ addresses have contacted it so that it can help the bridge authority guess
+ which countries have blocked access to it. If ExtraInfoStatistics is
+ enabled, it will be published as part of the extra-info document.
+ (Default: 1)
+
[[CellStatistics]] **CellStatistics** **0**|**1**::
Relays only.
When this option is enabled, Tor collects statistics about cell
@@ -2758,7 +2758,7 @@ types of statistics that Tor relays collect and publish:
(Default: 1)
[[HiddenServiceStatistics]] **HiddenServiceStatistics** **0**|**1**::
- Relays only.
+ Relays and bridges only.
When this option is enabled, a Tor relay writes obfuscated
statistics on its role as hidden-service directory, introduction
point, or rendezvous point to disk every 24 hours. If ExtraInfoStatistics
diff --git a/src/core/or/dos.c b/src/core/or/dos.c
index a5ea53bb3e..e8652c901e 100644
--- a/src/core/or/dos.c
+++ b/src/core/or/dos.c
@@ -819,7 +819,8 @@ dos_log_heartbeat(void)
char *msg = smartlist_join_strings(elems, ", ", 0, NULL);
- log_notice(LD_HEARTBEAT, "DoS mitigation since startup: %s.", msg);
+ log_notice(LD_HEARTBEAT,
+ "Heartbeat: DoS mitigation since startup: %s.", msg);
tor_free(msg);
SMARTLIST_FOREACH(elems, char *, e, tor_free(e));
diff --git a/src/core/or/status.c b/src/core/or/status.c
index df9577ada5..9e7ae70535 100644
--- a/src/core/or/status.c
+++ b/src/core/or/status.c
@@ -105,7 +105,7 @@ log_onion_service_stats(void)
}
log_notice(LD_HEARTBEAT,
- "Our onion service%s received %u v3 INTRODUCE2 cells "
+ "Heartbeat: Our onion service%s received %u v3 INTRODUCE2 cells "
"and attempted to launch %d rendezvous circuits.",
num_services == 1 ? "" : "s",
hs_stats_get_n_introduce2_v3_cells(),
diff --git a/src/feature/stats/rephist.c b/src/feature/stats/rephist.c
index fb97e0d255..4ad5d46b0c 100644
--- a/src/feature/stats/rephist.c
+++ b/src/feature/stats/rephist.c
@@ -209,7 +209,7 @@ static overload_stats_t overload_stats;
/** Return true if this overload happened within the last `n_hours`. */
static bool
-overload_happened_recently(time_t overload_time, unsigned n_hours)
+overload_happened_recently(time_t overload_time, int n_hours)
{
/* An overload is relevant if it happened in the last 72 hours */
if (overload_time > approx_time() - 3600 * n_hours) {
@@ -233,7 +233,7 @@ rep_hist_get_overload_stats_lines(void)
/* First encode the general overload */
if (overload_happened_recently(overload_stats.overload_general_time, 72)) {
format_iso_time(tbuf, overload_stats.overload_general_time);
- smartlist_add_asprintf(chunks, "overload-general %d %s",
+ smartlist_add_asprintf(chunks, "overload-general %d %s\n",
OVERLOAD_STATS_VERSION, tbuf);
}
@@ -243,7 +243,7 @@ rep_hist_get_overload_stats_lines(void)
format_iso_time(tbuf, overload_stats.overload_ratelimits_time);
smartlist_add_asprintf(chunks,
"overload-ratelimits %d %s %" PRIu64 " %" PRIu64
- " %" PRIu64 " %" PRIu64,
+ " %" PRIu64 " %" PRIu64 "\n",
OVERLOAD_STATS_VERSION, tbuf,
options->BandwidthRate, options->BandwidthBurst,
overload_stats.overload_read_count,
@@ -254,7 +254,7 @@ rep_hist_get_overload_stats_lines(void)
if (overload_happened_recently(
overload_stats.overload_fd_exhausted_time, 72)) {
format_iso_time(tbuf, overload_stats.overload_fd_exhausted_time);
- smartlist_add_asprintf(chunks, "overload-fd-exhausted %d %s",
+ smartlist_add_asprintf(chunks, "overload-fd-exhausted %d %s\n",
OVERLOAD_STATS_VERSION, tbuf);
}
@@ -263,7 +263,7 @@ rep_hist_get_overload_stats_lines(void)
goto done;
}
- result = smartlist_join_strings(chunks, "\n", 0, NULL);
+ result = smartlist_join_strings(chunks, "", 0, NULL);
done:
SMARTLIST_FOREACH(chunks, char *, cp, tor_free(cp));
diff --git a/src/test/test_stats.c b/src/test/test_stats.c
index a34713b650..465256a1e1 100644
--- a/src/test/test_stats.c
+++ b/src/test/test_stats.c
@@ -728,7 +728,7 @@ test_overload_stats(void *arg)
/* Now check the string */
stats_str = rep_hist_get_overload_stats_lines();
- tt_str_op("overload-general 1 2002-01-03 23:00:00", OP_EQ, stats_str);
+ tt_str_op("overload-general 1 2002-01-03 23:00:00\n", OP_EQ, stats_str);
tor_free(stats_str);
/* Move the time forward 72 hours: see that the line has disappeared. */
@@ -744,7 +744,7 @@ test_overload_stats(void *arg)
rep_hist_note_overload(OVERLOAD_GENERAL);
stats_str = rep_hist_get_overload_stats_lines();
- tt_str_op("overload-general 1 2002-01-07 00:00:00", OP_EQ, stats_str);
+ tt_str_op("overload-general 1 2002-01-07 00:00:00\n", OP_EQ, stats_str);
tor_free(stats_str);
/* Also note an fd exhaustion event */
@@ -752,7 +752,7 @@ test_overload_stats(void *arg)
stats_str = rep_hist_get_overload_stats_lines();
tt_str_op("overload-general 1 2002-01-07 00:00:00\n"
- "overload-fd-exhausted 1 2002-01-07 00:00:00", OP_EQ, stats_str);
+ "overload-fd-exhausted 1 2002-01-07 00:00:00\n", OP_EQ, stats_str);
tor_free(stats_str);
/* Move the time forward. Register DNS overload. See that the time changed */
@@ -763,7 +763,7 @@ test_overload_stats(void *arg)
stats_str = rep_hist_get_overload_stats_lines();
tt_str_op("overload-general 1 2002-01-07 02:00:00\n"
- "overload-fd-exhausted 1 2002-01-07 00:00:00", OP_EQ, stats_str);
+ "overload-fd-exhausted 1 2002-01-07 00:00:00\n", OP_EQ, stats_str);
tor_free(stats_str);
/* Move the time forward. Register a bandwidth ratelimit event. See that the
@@ -780,7 +780,7 @@ test_overload_stats(void *arg)
stats_str = rep_hist_get_overload_stats_lines();
tt_str_op("overload-general 1 2002-01-07 02:00:00\n"
"overload-ratelimits 1 2002-01-07 04:00:00 1000 2000 1 0\n"
- "overload-fd-exhausted 1 2002-01-07 00:00:00", OP_EQ, stats_str);
+ "overload-fd-exhausted 1 2002-01-07 00:00:00\n", OP_EQ, stats_str);
tor_free(stats_str);
/* Move the time forward 24 hours: no rate limit line anymore. */
@@ -789,7 +789,7 @@ test_overload_stats(void *arg)
stats_str = rep_hist_get_overload_stats_lines();
tt_str_op("overload-general 1 2002-01-07 02:00:00\n"
- "overload-fd-exhausted 1 2002-01-07 00:00:00", OP_EQ, stats_str);
+ "overload-fd-exhausted 1 2002-01-07 00:00:00\n", OP_EQ, stats_str);
tor_free(stats_str);
/* Move the time forward 44 hours: no fd exhausted line anymore. */
@@ -797,7 +797,7 @@ test_overload_stats(void *arg)
update_approx_time(current_time);
stats_str = rep_hist_get_overload_stats_lines();
- tt_str_op("overload-general 1 2002-01-07 02:00:00", OP_EQ, stats_str);
+ tt_str_op("overload-general 1 2002-01-07 02:00:00\n", OP_EQ, stats_str);
tor_free(stats_str);
/* Move the time forward 2 hours: there is nothing left. */
@@ -815,7 +815,7 @@ test_overload_stats(void *arg)
* registered ten more overload events, but only one should have been counted
* because of the rate limiter */
stats_str = rep_hist_get_overload_stats_lines();
- tt_str_op("overload-ratelimits 1 2002-01-10 02:00:00 1000 2000 2 0",
+ tt_str_op("overload-ratelimits 1 2002-01-10 02:00:00 1000 2000 2 0\n",
OP_EQ, stats_str);
tor_free(stats_str);
@@ -828,7 +828,7 @@ test_overload_stats(void *arg)
rep_hist_note_overload(OVERLOAD_READ);
}
stats_str = rep_hist_get_overload_stats_lines();
- tt_str_op("overload-ratelimits 1 2002-01-10 02:00:00 1000 2000 2 0",
+ tt_str_op("overload-ratelimits 1 2002-01-10 02:00:00 1000 2000 2 0\n",
OP_EQ, stats_str);
tor_free(stats_str);
@@ -842,7 +842,7 @@ test_overload_stats(void *arg)
rep_hist_note_overload(OVERLOAD_WRITE);
}
stats_str = rep_hist_get_overload_stats_lines();
- tt_str_op("overload-ratelimits 1 2002-01-10 02:00:00 1000 2000 3 1",
+ tt_str_op("overload-ratelimits 1 2002-01-10 02:00:00 1000 2000 3 1\n",
OP_EQ, stats_str);
tor_free(stats_str);
diff --git a/src/test/test_status.c b/src/test/test_status.c
index 284a6b7eaf..1d371645ae 100644
--- a/src/test/test_status.c
+++ b/src/test/test_status.c
@@ -359,8 +359,8 @@ test_status_hb_not_in_consensus(void *arg)
"initiated 0 and received 0 v3 connections; "
"initiated 0 and received 0 v4 connections; "
"initiated 0 and received 0 v5 connections.\n");
- expect_log_msg("DoS mitigation since startup: 0 circuits killed with "
- "too many cells, [DoSCircuitCreationEnabled disabled], "
+ expect_log_msg("Heartbeat: DoS mitigation since startup: 0 circuits killed "
+ "with too many cells, [DoSCircuitCreationEnabled disabled], "
"[DoSConnectionEnabled disabled], "
"[DoSRefuseSingleHopClientRendezvous disabled], "
"0 INTRODUCE2 rejected.\n");
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index de652f15ac..38b10c0e2d 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -217,7 +217,7 @@
#define USING_TWOS_COMPLEMENT
/* Version number of package */
-#define VERSION "0.4.6.1-alpha"
+#define VERSION "0.4.6.1-alpha-dev"
#define HAVE_STRUCT_SOCKADDR_IN6
#define HAVE_STRUCT_IN6_ADDR
7apu2bq3rhoylwmucxizk54afw5jyda7pho4j5zdcqpwkufke7zdzwad.onion