sengler/tor-parallel-relay-conn @ fc1134e3e59df2ca473e787f70a57ebf659d78f2

George Kadianakis 3b32f2508c Merge branch 'tor-github/pr/1307'		%!s(int64=5) %!d(string=hai) anos
..
.may_include	0362cdc169 Move fd and memory-info functions.	%!s(int64=6) %!d(string=hai) anos
include.am	721e65a1d5 Add comments to include.am files to note where new sources go	%!s(int64=5) %!d(string=hai) anos
meminfo.c	409df19b5a build: The <sys/sysctl.h> is now deprecated on Linux	%!s(int64=5) %!d(string=hai) anos
meminfo.h	60213a3621 Run "make autostyle."	%!s(int64=5) %!d(string=hai) anos