From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 28 Jun 2012 13:59:36 +0000 (-0400)
Subject: Merge branch 'sscanf_squashed'
X-Git-Tag: tor-0.2.4.1-alpha~112
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5a73df02176fb4c6ccd6a627c2cd14c5cfe4d9f8;p=thirdparty%2Ftor.git

Merge branch 'sscanf_squashed'
---

5a73df02176fb4c6ccd6a627c2cd14c5cfe4d9f8