commit 1d3ffc0ec96777203b2eafee5905464d54ef9f91 Merge: 9e44df2 65575b0 Author: Nick Mathewson nickm@torproject.org Date: Tue Apr 29 13:02:18 2014 -0400

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

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