sengler/tor-parallel-relay-conn @ 39a0a2c3ae8c93ceed42f6d2d1143002c231fc16

Nick Mathewson 626a8b60d7 Merge remote-tracking branch 'linus/bug5053-bug5055'		%!s(int64=13) %!d(string=hai) anos
..
5053	46c76e6bdd Changes files for tickets 5053 and 5055.	%!s(int64=13) %!d(string=hai) anos
5055	46c76e6bdd Changes files for tickets 5053 and 5055.	%!s(int64=13) %!d(string=hai) anos
bsd_queue	b555388dac Add a copy of OpenBSD's sys/queue.h as tor_queue.h	%!s(int64=13) %!d(string=hai) anos
bug7235	03b32161bc changes file for bug 7235	%!s(int64=13) %!d(string=hai) anos
ewma_policy_c99	05194cce62 Avoid c99 designated initializers in circuitmux_ewma.c	%!s(int64=13) %!d(string=hai) anos