Nick Mathewson 7556933537 Merge branch 'socks_trunnel4_squashed' into socks_trunnel4_squashed_merged %!s(int64=5) %!d(string=hai) anos
..
crypto e7f5f48d68 Rename torlog.[ch] to log.[ch] %!s(int64=5) %!d(string=hai) anos
mainloop a2c44a7a7e Isolate resolve.h usage in the modules that really need it. %!s(int64=5) %!d(string=hai) anos
or 7556933537 Merge branch 'socks_trunnel4_squashed' into socks_trunnel4_squashed_merged %!s(int64=5) %!d(string=hai) anos
proto 7556933537 Merge branch 'socks_trunnel4_squashed' into socks_trunnel4_squashed_merged %!s(int64=5) %!d(string=hai) anos
include.am 5aee26ee46 Move all use cases of micro-revision.i to a single place %!s(int64=5) %!d(string=hai) anos