]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'asn/ticket22727_032_02'
authorNick Mathewson <nickm@torproject.org>
Wed, 5 Jul 2017 13:49:12 +0000 (09:49 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 5 Jul 2017 13:49:12 +0000 (09:49 -0400)
1  2 
src/or/nodelist.c
src/or/nodelist.h

Simple merge
Simple merge