commit feeef00a6ad4629ab0d73b85195c0c9c8e9d57f0 Merge: cb488f9 30c06c1 Author: Nick Mathewson nickm@torproject.org Date: Tue May 21 13:46:28 2013 -0400

Merge remote-tracking branch 'origin/maint-0.2.4'

changes/bug8093.part1 | 3 +++ src/or/relay.c | 10 ++++------ 2 files changed, 7 insertions(+), 6 deletions(-)