sengler/tor-parallel-relay-conn @ 585eaa123f21c4fed85865b938aeafac47730fec

George Kadianakis 585eaa123f Merge branch 'tor-github/pr/1323'		%!s(int64=4) %!d(string=hai) anos
..
.dummy	df76da0f3b Add a .dummy file in the changes directory to stop git from removing it	%!s(int64=9) %!d(string=hai) anos
ticket31687_1	51475aee57 fp.c: Suppress float-conversion warnings on FreeBSD.	%!s(int64=4) %!d(string=hai) anos
ticket31687_2	97f7efa9e3 pf: when extracting an IPv6 address, make sure we got an IPv6 address	%!s(int64=4) %!d(string=hai) anos