sengler/tor-parallel-relay-conn @ aad40483b3b7e9a26a0324b7c86b496fb2f4de87

Nick Mathewson 217862b317 Merge remote-tracking branch 'public/bug6244_part2' into maint-0.2.3		%!s(int64=13) %!d(string=hai) anos
..
bug5238	dc9dd2324b Add version and bug number to 5238 changes file	%!s(int64=13) %!d(string=hai) anos
bug6244	23f2e37ff7 Allow wildcarded mapaddress targets in controller MAPADDRESS command	%!s(int64=13) %!d(string=hai) anos
bug6244_part2	28c42fe029 Fix GETINFO address-mappings/... with wildcarded addresses.	%!s(int64=13) %!d(string=hai) anos