sengler/tor-parallel-relay-conn @ 9bb0ac4bf107ca92bb62f419fd512f3d5989e70d

Nick Mathewson c775689e96 Merge remote-tracking branch 'tor-github/pr/244'		7 lat temu
..
crypto	e7f5f48d68 Rename torlog.[ch] to log.[ch]	8 lat temu
mainloop	da4f4cb269 Merge branch 'maint-0.3.4'	7 lat temu
or	c775689e96 Merge remote-tracking branch 'tor-github/pr/244'	7 lat temu
proto	8505522e50 Avoid a use-after-null-check in proto_socks.c	8 lat temu
include.am	5aee26ee46 Move all use cases of micro-revision.i to a single place	8 lat temu