commit f3b53391e8ff61eda6c2cdfa744e603565922cdb Author: Roger Dingledine <arma@torproject.org> Date: Tue May 22 14:26:34 2018 -0400 backport changelog entries for #24972 correctly --- ChangeLog | 4 ++-- ReleaseNotes | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8980ec9ef..870f8ebd5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -96,8 +96,8 @@ Changes in version 0.3.2.10 - 2018-03-03 Country database. o Minor features (logging, diagnostic, backport from 0.3.3.2-alpha): - - When logging a failure to check a hidden service's certificate, - also log what the problem with the certificate was. Diagnostic + - When logging a failure to create an onion service's descriptor, + also log what the problem with the descriptor was. Diagnostic for ticket 24972. o Minor bugfix (channel connection, backport from 0.3.3.2-alpha): diff --git a/ReleaseNotes b/ReleaseNotes index 671f2ff48..1ce162c8b 100644 --- a/ReleaseNotes +++ b/ReleaseNotes @@ -100,8 +100,8 @@ Changes in version 0.3.2.10 - 2018-03-03 Country database. o Minor features (logging, diagnostic, backport from 0.3.3.2-alpha): - - When logging a failure to check a hidden service's certificate, - also log what the problem with the certificate was. Diagnostic + - When logging a failure to create an onion service's descriptor, + also log what the problem with the descriptor was. Diagnostic for ticket 24972. o Minor bugfix (channel connection, backport from 0.3.3.2-alpha):