sengler/tor-parallel-relay-conn @ c50a053a95deffb5b8bd4a899f6d3a0d64fa43d7

Nick Mathewson 579770b706 Merge branch 'maint-0.3.4'		5 years ago
..
crypto	f45107e7de Rename crypto.c to crypto_cipher.c (since that's all it still has.)	6 years ago
mainloop	579770b706 Merge branch 'maint-0.3.4'	5 years ago
or	0db5c54957 Merge branch 'nss_squashed' into nss_merge	5 years ago
proto	8505522e50 Avoid a use-after-null-check in proto_socks.c	5 years ago
include.am	5aee26ee46 Move all use cases of micro-revision.i to a single place	6 years ago