Merge commit 'origin/maint-0.2.1'

diff --cc ChangeLog
Simple merge

diff --cc doc/spec/control-spec.txt
Simple merge

diff --cc src/common/log.c
Simple merge

diff --cc src/common/tortls.c
Simple merge

diff --cc src/common/util.c
Simple merge

diff --cc src/or/config.c
Simple merge

diff --cc src/or/control.c
Simple merge

diff --cc src/or/directory.c
Simple merge

diff --cc src/or/eventdns.c
Simple merge

diff --cc src/or/main.c
Simple merge

diff --cc src/or/rendclient.c
Simple merge

diff --cc src/or/rendservice.c
Simple merge

diff --cc src/or/routerparse.c
Simple merge

diff --cc src/or/test.c
Simple merge

diff --cc src/tools/tor-gencert.c
Simple merge