From 342712b9ef12c0234def9c2b4eb5c63f54c8bb5b Mon Sep 17 00:00:00 2001
From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 5 Sep 2017 15:02:16 -0400
Subject: [PATCH] Make url-canonicalizer canonicalize correctly.

---
 src/or/directory.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/or/directory.c b/src/or/directory.c
index 5bf544e67f..007235d108 100644
--- a/src/or/directory.c
+++ b/src/or/directory.c
@@ -1971,7 +1971,9 @@ parse_http_url(const char *headers, char **url)
   }
   if (strcmpstart(*url, "/tor/")) {
     char *new_url = NULL;
-    tor_asprintf(&new_url, "/tor/%s", *url);
+    tor_asprintf(&new_url, "/tor%s%s",
+                 *url[0] == '/' ? "" : "/",
+                 *url);
     tor_free(*url);
     *url = new_url;
   }