commit 648d5df628295f6bde4c94b5fb5302b982ef031f Merge: 00acccac6 05b6f73f1 Author: Nick Mathewson nickm@torproject.org Date: Wed Jun 26 09:49:40 2019 -0400

Merge remote-tracking branch 'tor-github/pr/1118' into maint-0.4.1

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(-)