commit b66712d85b5eb6a95db8d28a678ab8dd1baec19b Merge: 4662cbec7 e3f347803 Author: teor teor@torproject.org Date: Fri Aug 30 23:22:18 2019 +1000

Merge remote-tracking branch 'tor-github/pr/1117' into maint-0.3.5

changes/ticket30871 | 6 ++++++ src/feature/client/entrynodes.c | 4 ++++ src/test/test_circuitbuild.c | 47 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 57 insertions(+)