sengler/tor-parallel-relay-conn @ 53fc782e49a4548d100770f9a023e9b5cf46f87c

Nick Mathewson df0b4f0342 Merge branch 'feature16769_squashed'		8 vuotta sitten
..
.dummy	df76da0f3b Add a .dummy file in the changes directory to stop git from removing it	9 vuotta sitten
bug17109	ae98dd255b Check that openssl has ECC support during configure	8 vuotta sitten
feature16769	8234fa0053 Remove --master-key form the changes file	8 vuotta sitten
feature16944	0ba4e0895a Add "OfflineMasterKey" option	8 vuotta sitten
ipv6-exitpolicy-docs	249e82c906 Update docs with advice for separate IPv4 and IPv6 exit policies	8 vuotta sitten