sengler/tor-parallel-relay-conn @ 7f6af7a60281f00fde2e3b3f552edcc5f9311a04

Nick Mathewson f1de329e78 Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2		13 lat temu
..
Makefile.am	71fb687ddd Add --enable-static-zlib option	14 lat temu
tor-checkkey.c	14bc4dcc22 Rename log.h to torlog.h	14 lat temu
tor-gencert.c	f1de329e78 Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2	13 lat temu
tor-resolve.c	f1de329e78 Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2	13 lat temu