Merge branch 'tor-github/pr/993'

author George Kadianakis <desnacked@riseup.net>

Tue, 30 Apr 2019 16:13:57 +0000 (19:13 +0300)

committer George Kadianakis <desnacked@riseup.net>

Tue, 30 Apr 2019 16:13:57 +0000 (19:13 +0300)
author George Kadianakis <desnacked@riseup.net>
Tue, 30 Apr 2019 16:13:57 +0000 (19:13 +0300)
committer George Kadianakis <desnacked@riseup.net>
Tue, 30 Apr 2019 16:13:57 +0000 (19:13 +0300)
diff --cc scripts/maint/practracker/exceptions.txt
Simple merge
diff --cc src/core/include.am
Simple merge
diff --cc src/feature/nodelist/networkstatus.c
Simple merge
author	George Kadianakis <desnacked@riseup.net>
	Tue, 30 Apr 2019 16:13:57 +0000 (19:13 +0300)
committer	George Kadianakis <desnacked@riseup.net>
	Tue, 30 Apr 2019 16:13:57 +0000 (19:13 +0300)
		1	2
scripts/maint/practracker/exceptions.txt	patch \|	diff1 \|	diff2 \|	blob \| history
src/core/include.am	patch \|	diff1 \|	diff2 \|	blob \| history
src/feature/nodelist/networkstatus.c	patch \|	diff1 \|	diff2 \|	blob \| history