From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 23 Sep 2014 16:32:02 +0000 (-0400)
Subject: fixup! Download microdescriptors if you're a cache
X-Git-Tag: tor-0.2.6.3-alpha~119^2~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=06bda506003826bf9a28aec3afe0b7b1ae6cc9c0;p=thirdparty%2Ftor.git

fixup! Download microdescriptors if you're a cache
---

diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index 5bcfdb45bf..ff2f54de87 100644
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -4295,8 +4295,9 @@ MOCK_IMPL(STATIC void, initiate_descriptor_downloads,
 {
   char *resource, *cp;
   int digest_len = DIGEST_LEN, enc_digest_len = HEX_DIGEST_LEN;
-  char *sep = "+";
+  const char *sep = "+";
   int b64_256 = 0;
+  smartlist_t *tmp;
 
   if (purpose == DIR_PURPOSE_FETCH_MICRODESC) {
     /* Microdescriptors are downloaded by "-"-separated base64-encoded
@@ -4316,7 +4317,7 @@ MOCK_IMPL(STATIC void, initiate_descriptor_downloads,
     return;
 
   digest_len += 1;  // for the NULL
-  smartlist_t *tmp = smartlist_new();
+  tmp = smartlist_new();
 
   for (; lo < hi; ++lo) {
     cp = tor_malloc(enc_digest_len);