sarah
/
tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'maint-0.2.8' into release-0.2.8

This commit is contained in:
Nick Mathewson 2016-06-21 09:00:37 -04:00
parent a839ed5cc1 b432efb838
commit cf13189064
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
changes/bug19464 Normal file
View File

@ -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.

2
src/or/rendservice.c
View File

@ -3465,8 +3465,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;
}