commit ad28397bbf1744993538fa96675a55bba59f2b57 Merge: 522b312 e53e6ca Author: Nick Mathewson <nickm@torproject.org> Date: Thu Feb 7 15:04:11 2013 -0500 Merge branch 'bug7902' changes/bug7902 | 7 +++++++ src/or/reasons.c | 7 ++++++- src/or/relay.c | 10 ++++++++-- 3 files changed, 21 insertions(+), 3 deletions(-)