aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2016-06-21 09:00:40 -0400
committerNick Mathewson <nickm@torproject.org>2016-06-21 09:00:40 -0400
commitcb8557f7c93abc8b770f1753d2e39dafb2a9fe3b (patch)
treea9dc82360dd9846618617834bb87e6bbba0f7b52
parentdd9cebf1099996d3361110fddfc2cf47beb94c5d (diff)
parentb432efb8381360fb10179c67156b8ed5a05e290b (diff)
downloadtor-cb8557f7c93abc8b770f1753d2e39dafb2a9fe3b.tar.gz
tor-cb8557f7c93abc8b770f1753d2e39dafb2a9fe3b.zip
Merge branch 'maint-0.2.8'
-rw-r--r--changes/bug194646
-rw-r--r--src/or/rendservice.c2
2 files changed, 6 insertions, 2 deletions
diff --git a/changes/bug19464 b/changes/bug19464
new file mode 100644
index 0000000000..22c9e73dc7
--- /dev/null
+++ b/changes/bug19464
@@ -0,0 +1,6 @@
+ o Minor bugfixes (user interface):
+ - Remove a warning message "Service [scrubbed] not found after
+ descriptor upload". This message appears when one uses HSPOST control
+ command to upload a service descriptor. Since there is only a descriptor
+ and no service, showing this message is pointless and confusing.
+ Fixes bug 19464; bugfix on 0.2.7.2-alpha.
diff --git a/src/or/rendservice.c b/src/or/rendservice.c
index ff23050300..c50de83f7e 100644
--- a/src/or/rendservice.c
+++ b/src/or/rendservice.c
@@ -3460,8 +3460,6 @@ rend_service_desc_has_uploaded(const rend_data_t *rend_data)
service = rend_service_get_by_service_id(rend_data->onion_address);
if (service == NULL) {
- log_warn(LD_REND, "Service %s not found after descriptor upload",
- safe_str_client(rend_data->onion_address));
return;
}