[tor-commits] [tor/master] Merge remote-tracking branch 'dgoulet/ticket27797_035_01'

[nickm at torproject.org]

commit 96d1f2e6d0ebcb97aa66a1416d147533b24fac9c
Merge: 55122bfe0 e3713f17f
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Sep 21 09:33:03 2018 -0400

    Merge remote-tracking branch 'dgoulet/ticket27797_035_01'

 changes/ticket27797             | 5 +++++
 src/feature/nodelist/nodelist.c | 5 +++++
 2 files changed, 10 insertions(+)