commit 70cb7afcffc3fda3cad8a90325c6cd5b4d519736 Merge: c19ced7 c66f3f5 Author: Nick Mathewson <nickm@torproject.org> Date: Fri Oct 7 13:17:45 2011 -0400 Merge remote-tracking branch 'asn/bug3437_v2' src/managed.c | 2 ++ src/sha256.c | 5 ++++- 2 files changed, 6 insertions(+), 1 deletions(-)