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