commit 0fa1d8ef92a2911fcf660bc57637d525988d63b6 Merge: 9c73f5adc 5675cbd4c Author: teor teor@torproject.org Date: Tue Mar 17 21:08:45 2020 +1000

Merge branch 'pr1777_squashed'

.appveyor.yml | 4 ++-- .travis.yml | 13 +++++++------ changes/ticket32143 | 4 ++++ configure.ac | 7 +++++++ src/feature/dircache/conscache.c | 15 +++++++++++++++ src/test/test_circuitbuild.c | 4 ++++ src/test/test_dir.c | 6 ++++++ src/test/test_hs_intropoint.c | 3 +++ src/test/test_protover.c | 6 ++++-- 9 files changed, 52 insertions(+), 10 deletions(-)