commit 8c1eb28d610706d15e97531d778e78173d6701b1 Merge: b3235e21a ffc7b81b5 Author: Nick Mathewson nickm@torproject.org Date: Sat Dec 1 11:15:09 2018 -0500

Merge branch 'maint-0.3.3' into release-0.3.3

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