aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2020-07-07 11:08:20 -0400
committerNick Mathewson <nickm@torproject.org>2020-07-07 11:08:20 -0400
commit9e33391ebb01700d3f3f9cb29a6b74756559de4a (patch)
treec1db56e15f0e7e82edbc8784b2f54a1de64fd772
parent640a777c9bf3b581dd951a9021aefe3f8dd9d3ce (diff)
parent118c35b55bb7c6f03a6a39558a35ee754b58942a (diff)
downloadtor-9e33391ebb01700d3f3f9cb29a6b74756559de4a.tar.gz
tor-9e33391ebb01700d3f3f9cb29a6b74756559de4a.zip
Merge remote-tracking branch 'tor-github/pr/1974/head'
-rw-r--r--src/feature/hs/hs_service.c3
-rw-r--r--src/feature/rend/rendservice.c3
2 files changed, 6 insertions, 0 deletions
diff --git a/src/feature/hs/hs_service.c b/src/feature/hs/hs_service.c
index 249eb47b5d..995c1ca78b 100644
--- a/src/feature/hs/hs_service.c
+++ b/src/feature/hs/hs_service.c
@@ -2874,6 +2874,9 @@ upload_descriptor_to_hsdir(const hs_service_t *service,
hsdir->hsdir_index.store_first;
char *blinded_pubkey_log_str =
tor_strdup(hex_str((char*)&desc->blinded_kp.pubkey.pubkey, 32));
+ /* This log message is used by Chutney as part of its bootstrap
+ * detection mechanism. Please don't change without first checking
+ * Chutney. */
log_info(LD_REND, "Service %s %s descriptor of revision %" PRIu64
" initiated upload request to %s with index %s (%s)",
safe_str_client(service->onion_address),
diff --git a/src/feature/rend/rendservice.c b/src/feature/rend/rendservice.c
index d92b5436ea..585fdb532e 100644
--- a/src/feature/rend/rendservice.c
+++ b/src/feature/rend/rendservice.c
@@ -3846,6 +3846,9 @@ upload_service_descriptor(rend_service_t *service)
rend_get_service_id(service->desc->pk, serviceid);
if (get_options()->PublishHidServDescriptors) {
/* Post the current descriptors to the hidden service directories. */
+ /* This log message is used by Chutney as part of its bootstrap
+ * detection mechanism. Please don't change without first checking
+ * Chutney. */
log_info(LD_REND, "Launching upload for hidden service %s",
serviceid);
directory_post_to_hs_dir(service->desc, descs, NULL, serviceid,