tiny tweaks on r12900

svn:r12901

diff --git a/src/or/rendservice.c b/src/or/rendservice.c
index cd8af9f19a335db5a4600d4cb2747d65145db25b..e80d5e947e56f6074afd2b0c3f04add2ab780523 100644 (file)
--- a/src/or/rendservice.c
+++ b/src/or/rendservice.c
@@ -347,9 +347,9 @@ rend_service_update_descriptor(rend_service_t *service)
   d->timestamp = time(NULL);
   d->version = service->descriptor_version;
   d->intro_nodes = smartlist_create();
-  /* XXXX020 Why should we support the old intro protocol 0? Whoever
-   * understands descriptor version 2 also understands intro protocol 2. */
-  d->protocols = 1 << 2; /*< We only support intro protocol 2. */
+  /* Whoever understands descriptor version 2 also understands intro
+   * protocol 2. So we only support 2. */
+  d->protocols = 1 << 2;
 
   for (i = 0; i < smartlist_len(service->intro_nodes); ++i) {
     rend_intro_point_t *intro_svc = smartlist_get(service->intro_nodes, i);

diff --git a/src/or/routerparse.c b/src/or/routerparse.c
index a7eeeb4408737909d5e689e9c9287d95de4e1add..6ec4e4bcce6ed0686939d6850b9721042af3d3ec 100644 (file)
--- a/src/or/routerparse.c
+++ b/src/or/routerparse.c
@@ -3414,7 +3414,7 @@ rend_decrypt_introduction_points(rend_service_descriptor_t *parsed,
     intro_points_encrypted_size = unenclen;
   }
   /* Consider one intro point after the other. */
-  current_ipo = (const char **)&intro_points_encrypted;
+  current_ipo = &intro_points_encrypted;
   tokens = smartlist_create();
   parsed->intro_nodes = smartlist_create();
   while (!strcmpstart(*current_ipo, "introduction-point ")) {

diff --git a/src/or/test.c b/src/or/test.c
index c314a21cd713b6b72a71aff175ae260b2b5910f8..d009bfd88be1248f3fb63aebaf97b1e4950a2e6d 100644 (file)
--- a/src/or/test.c
+++ b/src/or/test.c
@@ -3374,6 +3374,7 @@ test_rend_fns_v2(void)
     rend_encoded_v2_service_descriptor_free(smartlist_get(descs, i));
   smartlist_free(descs);
   rend_service_descriptor_free(parsed);
+  rend_service_descriptor_free(generated);
 }
 
 static void