commit 3402b140897ca22301c2f1d741453466d237222a Merge: b6c8530 551ad20 Author: Nick Mathewson nickm@torproject.org Date: Wed Jul 5 09:49:12 2017 -0400

Merge remote-tracking branch 'asn/ticket22727_032_02'

src/or/nodelist.c | 42 ++++++++++++++++++++++++++++++++++++++++++ src/or/nodelist.h | 2 ++ src/or/protover.h | 5 +++++ 3 files changed, 49 insertions(+)