commit eda8e06319b89bc5ac90045a0af0afbb3140bdfd
Merge: d05db8601 a52a5e009
Author: teor <teor(a)torproject.org>
Date: Fri Aug 30 23:33:06 2019 +1000
Merge branch 'maint-0.4.0' into release-0.4.0
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(-)