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

[nickm at torproject.org]

commit cbea95ae6736e5ec62af6b7341245a84629e3a2c
Merge: e9ec63d1a 5acfc3087
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Mar 27 18:23:53 2018 -0400

    Merge branch 'maint-0.3.1' into release-0.3.1

 changes/bug25629  |  3 +++
 src/or/nodelist.c | 13 ++++++-------
 2 files changed, 9 insertions(+), 7 deletions(-)