[tor-commits] [tor/master] Merge remote-tracking branch 'catalyst-github/bug25629-033' into maint-0.3.3

[nickm at torproject.org]

commit ddee28a3c9b9dd256cd6560a4766f17a6c6fc13d
Merge: da5173c83 471f28a2a
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Mar 27 18:25:41 2018 -0400

    Merge remote-tracking branch 'catalyst-github/bug25629-033' into maint-0.3.3

 changes/bug25629  |  3 +++
 src/or/nodelist.c | 28 ++++++++++++++--------------
 2 files changed, 17 insertions(+), 14 deletions(-)