commit 0514bcd37c6e6e0eb3f3c47da94cb182d01ef15f Merge: c0a73c8 1d3ffc0 Author: Nick Mathewson nickm@torproject.org Date: Tue Apr 29 13:03:27 2014 -0400

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

changes/md_leak_bug | 5 +++++ src/or/routerparse.c | 2 ++ 2 files changed, 7 insertions(+)