commit 8d6aafbb4a7f4f9748b88f5ce16675900559149e Merge: be841f7 ce5406b Author: Nick Mathewson nickm@torproject.org Date: Thu Jan 7 12:50:10 2016 -0800

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

src/common/address.c | 2 +- src/or/main.c | 2 +- src/or/or.h | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-)