commit 1060688d2a351329ad6a4b751e312242b57531a0 Merge: 5e04042 7e0f1fa Author: Nick Mathewson nickm@torproject.org Date: Tue Oct 8 12:17:14 2013 -0400

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

changes/bug6979 | 4 ++++ src/or/router.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-)