[tor-commits] [tor/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5

[nickm at torproject.org]

commit d098dda776e165647a39ebd7d8dc9982086d8059
Merge: 900d9a860 a58b19465
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Nov 14 07:56:52 2018 -0500

    Merge branch 'maint-0.3.5' into release-0.3.5

 changes/bug28441                | 4 ++++
 src/feature/nodelist/nodelist.c | 3 +--
 2 files changed, 5 insertions(+), 2 deletions(-)