commit 0fe9657c8c9181a6623fdb69000f28a3cd2c9a59 Merge: 167dd097e 9644f3462 Author: Nick Mathewson nickm@torproject.org Date: Wed Jun 26 09:50:00 2019 -0400

Merge remote-tracking branch 'tor-github/pr/1119'

changes/ticket30871 | 6 ++++ scripts/maint/practracker/exceptions.txt | 4 +-- src/feature/client/entrynodes.c | 4 +++ src/test/test_circuitbuild.c | 47 ++++++++++++++++++++++++++++++++ 4 files changed, 59 insertions(+), 2 deletions(-)