sengler/tor-parallel-relay-conn @ b01bd73d92d59f5ec58d9944b1dfe0a173192ed7

Nick Mathewson d6d3e829dd Merge branch 'maint-0.4.1'		4 lat temu
..
.dummy	df76da0f3b Add a .dummy file in the changes directory to stop git from removing it	9 lat temu
ticket31772	25af8ada30 Correct the syntax description for the MAPADDRESS command.	4 lat temu