commit 6da989cfe8323418ee1f888287d0d65b21b60c1d Merge: 2d8d6d1eb b4977d1aa Author: Nick Mathewson nickm@torproject.org Date: Mon Jan 6 13:20:57 2020 -0500
Merge remote-tracking branch 'tor-github/pr/1612' into maint-0.4.2
changes/bug32771 | 4 ++++ changes/ticket32765 | 4 ++++ src/lib/confmgt/structvar.c | 4 ++-- src/lib/log/util_bug.h | 6 ++++-- 4 files changed, 14 insertions(+), 4 deletions(-)
tor-commits@lists.torproject.org