From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 16 Jul 2013 17:44:00 +0000 (-0400)
Subject: Break up <??> differently, and explain why
X-Git-Tag: tor-0.2.5.1-alpha~67^2~24
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6dd8ff0ad9cf32ab7b22d1e2c9fc24477300fa4f;p=thirdparty%2Ftor.git

Break up <??> differently, and explain why
---

diff --git a/src/or/ext_orport.c b/src/or/ext_orport.c
index cd8ab2d04e..72dbaa55a7 100644
--- a/src/or/ext_orport.c
+++ b/src/or/ext_orport.c
@@ -515,8 +515,11 @@ connection_ext_or_process_inbuf(or_connection_t *or_conn)
 
       /* If the transport proxy did not use the TRANSPORT command to
        * specify the transport name, mark this as unknown transport. */
-      if (!or_conn->ext_or_transport)
-        or_conn->ext_or_transport = tor_strdup("<?\?>");
+      if (!or_conn->ext_or_transport) {
+        /* We write this string this way to avoid ??>, which is a C
+         * trigraph. */
+        or_conn->ext_or_transport = tor_strdup("<?" "?>");
+      }
 
       connection_write_ext_or_command(conn, EXT_OR_CMD_BT_OKAY, NULL, 0);