commit d0009cb8e8bd2a6f1c84f9f117a71f84045fdfce Merge: d28670c 0400744 Author: Nick Mathewson nickm@torproject.org Date: Wed Aug 20 12:44:15 2014 -0400

Merge remote-tracking branch 'public/bug12728_024'

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