Merge branch 'maint-0.4.3'

changes/ticket33623

+  o Minor feature (sendme, flow control):
+    - Default on sending SENDME version 1 cells. Closes ticket 33623.

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)
 

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