From: Nick Mathewson <nickm@torproject.org>
Date: Sat, 15 Feb 2014 20:59:10 +0000 (-0500)
Subject: Merge branch 'bug4900_siphash_v2'
X-Git-Tag: tor-0.2.5.3-alpha~71
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=35423d397f9d4f7810e538b608ded47c33311026;p=thirdparty%2Ftor.git

Merge branch 'bug4900_siphash_v2'
---

35423d397f9d4f7810e538b608ded47c33311026