sengler/tor-parallel-relay-conn @ 7ff67d0e90d1cdf206747649df79dbb88a7467a8

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