commit 95d47a74815ede0e4d0296f02db39dca3e0c1b39 Merge: 0073c5b d9564d5 Author: Nick Mathewson nickm@torproject.org Date: Wed Jun 4 15:30:43 2014 -0400

Merge remote-tracking branch 'public/bug12169_relay_check'

changes/bug12169_simple | 5 +++++ src/or/relay.c | 10 +++++----- 2 files changed, 10 insertions(+), 5 deletions(-)