From ee3e987898a1e656950aabf8bf0a99aed1450a98 Mon Sep 17 00:00:00 2001 From: David Goulet Date: Tue, 17 Mar 2020 10:14:57 -0400 Subject: [PATCH 1/2] sendme: Emit version 1 by default Closes #33623 Signed-off-by: David Goulet --- changes/ticket33623 | 2 ++ src/core/or/sendme.h | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 changes/ticket33623 diff --git a/changes/ticket33623 b/changes/ticket33623 new file mode 100644 index 0000000000..528af3ca02 --- /dev/null +++ b/changes/ticket33623 @@ -0,0 +1,2 @@ + o Minor feature (sendme, flow control): + - Default on sending SENDME version 1 cells. Closes ticket 33623. diff --git a/src/core/or/sendme.h b/src/core/or/sendme.h index 20477103fd..9d757ee435 100644 --- a/src/core/or/sendme.h +++ b/src/core/or/sendme.h @@ -48,7 +48,7 @@ void sendme_record_sending_cell_digest(circuit_t *circ, crypt_path_t *cpath); #define SENDME_MAX_SUPPORTED_VERSION 1 /* The cell version constants for when emitting a cell. */ -#define SENDME_EMIT_MIN_VERSION_DEFAULT 0 +#define SENDME_EMIT_MIN_VERSION_DEFAULT 1 #define SENDME_EMIT_MIN_VERSION_MIN 0 #define SENDME_EMIT_MIN_VERSION_MAX UINT8_MAX From 85414e1c18b09755d4371c30726ecbef562e7412 Mon Sep 17 00:00:00 2001 From: teor Date: Thu, 19 Mar 2020 09:24:15 +1000 Subject: [PATCH 2/2] doc: Fix a man page typo Obviously correct changes to already-reviewed code. --- doc/tor.1.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 8f5b43ca5f..7abb22c076 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -2665,7 +2665,7 @@ types of statistics that Tor relays collect and publish: its extra-info documents that it uploads to the directory authorities. Disabling this option also removes bandwidth usage statistics, and GeoIPFile and GeoIPv6File hashes from the extra-info file. Bridge - ServerTransportPlugin lines are always includes in the extra-info file, + ServerTransportPlugin lines are always included in the extra-info file, because they are required by BridgeDB. (Default: 1)