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