Make url-canonicalizer canonicalize correctly.

diff --git a/src/or/directory.c b/src/or/directory.c
index 5bf544e67fc1cd7c11bd8189007bae75e0186e73..007235d108e6cfccceeb166846f3ef844b4d0e81 100644 (file)
--- 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;
   }