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