Merge remote-tracking branch 'arma/feature18998'

changes/feature18998

@@ -0,0 +1,5 @@
+  o Minor features:
+    - Stop being so strict about the payload length of "rendezvous1"
+      cells. We used to be locked in to the "tap" handshake length,
+      and now we can handle better handshakes like "ntor". Resolves
+      ticket 18998.

src/or/rendmid.c

@@ -309,7 +309,7 @@ rend_mid_rendezvous(or_circuit_t *circ, const uint8_t *request,
     goto err;
   }
 
-  if (request_len != REND_COOKIE_LEN+DH_KEY_LEN+DIGEST_LEN) {
+  if (request_len < REND_COOKIE_LEN) {
     log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL,
          "Rejecting RENDEZVOUS1 cell with bad length (%d) on circuit %u.",
          (int)request_len, (unsigned)circ->p_circ_id);