[tor-commits] [tor/master] Merge branch 'maint-0.3.3'

[nickm at torproject.org]

commit fa6eaab83e05a11b60735f7bf4064b05e7085230
Merge: 979c7e5c8 ddee28a3c
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Mar 27 18:25:52 2018 -0400

    Merge branch 'maint-0.3.3'

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