commit 5a73df02176fb4c6ccd6a627c2cd14c5cfe4d9f8 Merge: e12eba5 d4285f0 Author: Nick Mathewson nickm@torproject.org Date: Thu Jun 28 09:59:36 2012 -0400

Merge branch 'sscanf_squashed'

changes/bug4195 | 6 ++ src/common/util.c | 151 +++++++++++++++++++++++++++++++++++++++++++++++--- src/or/rephist.c | 6 +- src/test/test_util.c | 75 +++++++++++++++++++++++++ 4 files changed, 226 insertions(+), 12 deletions(-)