commit a836dd25309935edf74d993be1d437afdccc073a Merge: f311d0676 1132dc9f7 Author: teor teor@torproject.org Date: Wed Sep 4 13:57:15 2019 +1000

Merge branch 'maint-0.3.5' into bug31571_035

changes/bug30894 | 4 ++++ changes/bug31003 | 4 ++++ changes/ticket30871 | 6 +++++ src/app/config/confparse.c | 1 + src/feature/client/entrynodes.c | 4 ++++ src/feature/nodelist/routerlist.c | 12 +++++----- src/test/test_circuitbuild.c | 47 +++++++++++++++++++++++++++++++++++++++ 7 files changed, 72 insertions(+), 6 deletions(-)