[tor-commits] [tor/maint-0.4.0] Merge branch 'maint-0.3.5' into maint-0.4.0

[teor at torproject.org]

commit a52a5e0099f9201e0dc1a358b1ac7721070caf56
Merge: 357e9a6f2 1132dc9f7
Author: teor <teor at torproject.org>
Date:   Fri Aug 30 23:33:01 2019 +1000

    Merge branch 'maint-0.3.5' into maint-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(-)