sengler/tor-parallel-relay-conn @ 8324824d8f7cd9a68b2c2d6d50aa7ad28b9ba761

Nick Mathewson 885e8d35c7 Merge remote-tracking branch 'mikeperry/209-path-bias-changes'		%!s(int64=13) %!d(string=hai) anos
..
bug7157	08da247042 Update changes file.	%!s(int64=13) %!d(string=hai) anos
dh_benchmarks	2f8fd53750 Add benchmark for DH handshake and ECDH-P-224/56 handshake	%!s(int64=13) %!d(string=hai) anos
dirguards	0c4210fb65 Directory guard implementation.	%!s(int64=13) %!d(string=hai) anos
tls_ecdhe	25afecdbf9 Make ECDHE group configurable: 224 for public, 256 for bridges (default)	%!s(int64=13) %!d(string=hai) anos