Merge remote-tracking branch 'origin/maint-0.2.2'

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

diff --cc src/common/crypto.h
Simple merge

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

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

diff --cc src/or/rendcommon.h
Simple merge

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