Merge branch 'ticket23304_032_01_squashed'

This commit is contained in:
Nick Mathewson 2017-09-11 16:13:55 -04:00
commit fca590a63f

View File

@ -943,7 +943,10 @@ hs_client_decode_descriptor(const char *desc_str,
ret = hs_desc_decode_descriptor(desc_str, subcredential, desc); ret = hs_desc_decode_descriptor(desc_str, subcredential, desc);
memwipe(subcredential, 0, sizeof(subcredential)); memwipe(subcredential, 0, sizeof(subcredential));
if (ret < 0) { if (ret < 0) {
log_warn(LD_GENERAL, "Could not parse received descriptor as client"); log_warn(LD_GENERAL, "Could not parse received descriptor as client.");
if (get_options()->SafeLogging_ == SAFELOG_SCRUB_NONE) {
log_warn(LD_GENERAL, "%s", escaped(desc_str));
}
goto err; goto err;
} }