commit e82023d2f7b75f9ff8c4bf1ddb3c4e251142d3ab Merge: 72c1303ce e3a19b1c7 Author: Nick Mathewson nickm@torproject.org Date: Sat Dec 1 11:15:09 2018 -0500

Merge branch 'maint-0.3.4' into maint-0.3.5

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