commit 35e19b9498e3d23d87d7adacd4ec27969d63d315 Merge: 6a88615 1f5a791 Author: Nick Mathewson nickm@torproject.org Date: Wed Sep 12 11:11:16 2012 -0400

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

changes/bug6341 | 5 +++++ src/or/relay.c | 2 +- 2 files changed, 6 insertions(+), 1 deletions(-)