commit 787da5185c531c890343c0b95190de9f48246934 Merge: e8b81d7dc cb9fa3b04 Author: Nick Mathewson nickm@torproject.org Date: Thu Sep 13 13:30:53 2018 -0400

Merge remote-tracking branch 'onionk/strcmpstart1'

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