summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Færøy <ahf@torproject.org>2020-06-30 14:15:57 +0000
committerAlexander Færøy <ahf@torproject.org>2020-06-30 14:15:57 +0000
commit881f50a9a98102a4540575713b621652f108aef1 (patch)
treeb7e7983f8e010c298d6893c24731d9aa8f74a7bd
parentc9c4a3d0f60580b7deeadc59a845e272ab8aa949 (diff)
parentee3e987898a1e656950aabf8bf0a99aed1450a98 (diff)
downloadtor-881f50a9a98102a4540575713b621652f108aef1.tar.gz
tor-881f50a9a98102a4540575713b621652f108aef1.zip
Merge branch 'tor-github/pr/1806' into maint-0.4.2
-rw-r--r--changes/ticket336232
-rw-r--r--src/core/or/sendme.h2
2 files changed, 3 insertions, 1 deletions
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