Merge remote-tracking branch 'teor/comments-20151123'

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

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

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