commit e3a19b1c788ba303a41cab0dcba945af84041764 Merge: 36c323553 ffc7b81b5 Author: Nick Mathewson nickm@torproject.org Date: Sat Dec 1 11:15:09 2018 -0500

Merge branch 'maint-0.3.3' into maint-0.3.4

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