commit 89ca35ff54e21a172034652a9b152d4fc8103a54 Merge: 8c77a9444 648d5df62 Author: Nick Mathewson nickm@torproject.org Date: Wed Jun 26 09:51:32 2019 -0400

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