tor

commit fe5ecaa270b037e76226bd7acda10a14611eef93
parent 78b2984ac99ead6f87504cda9b4f61d5641cb533
Author: teor <teor@torproject.org>
Date:   Thu, 19 Mar 2020 17:02:02 +1000

Merge branch 'maint-0.4.3'

Diffstat:
A
changes/ticket33623
 | 
2
++
M
doc/tor.1.txt
 | 
2
+-
M
src/core/or/sendme.h
 | 
2
+-

3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/changes/ticket33623 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/doc/tor.1.txt b/doc/tor.1.txt
@@ -2656,7 +2656,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)
 
diff --git 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