[tor-commits] [tor/master] + is not how we say concatenate

[arma at torproject.org]

commit 1987157d0c1e9acb0b88156e7104fbc8a11c5932
Author: Roger Dingledine <arma at torproject.org>
Date:   Mon Sep 22 20:09:03 2014 -0400

    + is not how we say concatenate
---
 src/or/rendcommon.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/or/rendcommon.c b/src/or/rendcommon.c
index aca9da1..269cd65 100644
--- a/src/or/rendcommon.c
+++ b/src/or/rendcommon.c
@@ -155,7 +155,7 @@ rend_compute_v2_desc_id(char *desc_id_out, const char *service_id,
   }
   /* Calculate current time-period. */
   time_period = get_time_period(now, 0, service_id_binary);
-  /* Calculate secret-id-part = h(time-period + replica). */
+  /* Calculate secret-id-part = h(time-period | replica). */
   get_secret_id_part_bytes(secret_id_part, time_period, descriptor_cookie,
                            replica);
   /* Calculate descriptor ID. */
@@ -556,7 +556,7 @@ rend_encode_v2_descriptors(smartlist_t *descs_out,
     char desc_digest[DIGEST_LEN];
     rend_encoded_v2_service_descriptor_t *enc =
       tor_malloc_zero(sizeof(rend_encoded_v2_service_descriptor_t));
-    /* Calculate secret-id-part = h(time-period + cookie + replica). */
+    /* Calculate secret-id-part = h(time-period | cookie | replica). */
     get_secret_id_part_bytes(secret_id_part, time_period, descriptor_cookie,
                              k);
     base32_encode(secret_id_part_base32, sizeof(secret_id_part_base32),