commit 8954cbfcf868ca1246b61ed5ac9ffaf37052cc77 Merge: 4b37c2d1d e82023d2f Author: Nick Mathewson nickm@torproject.org Date: Sat Dec 1 11:15:09 2018 -0500

Merge branch 'maint-0.3.5' into release-0.3.5

changes/bug28554 | 3 +++ src/test/test_entrynodes.c | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-)