From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 1 Nov 2012 02:04:09 +0000 (-0400)
Subject: Only send begin cell flags when we have some to send
X-Git-Tag: tor-0.2.4.7-alpha~35^2~30
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5ee1de65b09e51ed2eea740cfd95ade3abe99e58;p=thirdparty%2Ftor.git

Only send begin cell flags when we have some to send
---

diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c
index 2a46529f01..e1c6938a93 100644
--- a/src/or/connection_edge.c
+++ b/src/or/connection_edge.c
@@ -1683,7 +1683,7 @@ connection_ap_handshake_send_begin(entry_connection_t *ap_conn)
                  ap_conn->socks_request->address : "",
                ap_conn->socks_request->port);
   payload_len = (int)strlen(payload)+1;
-  if (payload_len <= RELAY_PAYLOAD_SIZE - 4) {
+  if (payload_len <= RELAY_PAYLOAD_SIZE - 4 && edge_conn->begincell_flags) {
     set_uint32(payload + payload_len, htonl(edge_conn->begincell_flags));
     payload_len += 4;
   }