diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-09-11 16:13:55 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-09-11 16:13:55 -0400 |
| commit | fca590a63f8950b910d4f6b3a4ff39a009e9bf32 (patch) | |
| tree | 11afd72d59f0d1ec306f38d99e784d3c34b989e3 /src/or/hs_client.c | |
| parent | 59072d20277fe6250d0e9b6cf90bf41a75ad651c (diff) | |
| parent | 00967cd2a87f8ef4c30bfcebd8eae9c9fb2ed251 (diff) | |
| download | tor-fca590a63f8950b910d4f6b3a4ff39a009e9bf32.tar.gz tor-fca590a63f8950b910d4f6b3a4ff39a009e9bf32.zip | |
Merge branch 'ticket23304_032_01_squashed'
Diffstat (limited to 'src/or/hs_client.c')
| -rw-r--r-- | src/or/hs_client.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/or/hs_client.c b/src/or/hs_client.c index f85ebc8473..c98131cc77 100644 --- a/src/or/hs_client.c +++ b/src/or/hs_client.c @@ -943,7 +943,10 @@ hs_client_decode_descriptor(const char *desc_str, ret = hs_desc_decode_descriptor(desc_str, subcredential, desc); memwipe(subcredential, 0, sizeof(subcredential)); 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; } |