Merge branch 'bug2352_obsize' into maint-0.2.1

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

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

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

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