Merge remote branch 'sebastian/bug2314' into maint-0.2.2

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

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

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

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