commit 7c0778ef7e05e859c62346a795952f127972b35e Merge: fd22fa183b fcae26adf7 Author: Nick Mathewson <nickm@torproject.org> Date: Mon Nov 16 22:42:22 2020 -0500 Merge branch 'maint-0.3.5' into maint-0.4.3 changes/bug40179_part1 | 4 ++++ src/test/hs_ntor_ref.py | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-)