commit 50fc8fb5c5b591fbcaa7e9d5572fa52a1e1b19ae Merge: 7e0f1fa c7c2478 Author: Nick Mathewson nickm@torproject.org Date: Tue Oct 8 13:37:13 2013 -0400

Merge remote-tracking branch 'public/bug9927' into maint-0.2.4

changes/bug9927 | 4 ++++ src/or/directory.c | 2 ++ src/or/relay.c | 1 + 3 files changed, 7 insertions(+)