Merge remote-tracking branch 'public/bug19152_024_v2' into maint-0.2.4
commitd6eae78e2928544ad634356887c7a83a2cd23eaa
authorNick Mathewson <nickm@torproject.org>
Tue, 7 Feb 2017 13:47:11 +0000 (7 08:47 -0500)
committerNick Mathewson <nickm@torproject.org>
Tue, 7 Feb 2017 13:47:11 +0000 (7 08:47 -0500)
treecf9d60b5d927da2067987a8f7628eeffebe922fa
parent51675f97d30e48da68f2cf538f7f805f51af4c36
parentc4c4380a5e43e97ff9533aa42c73183dd1054c41
Merge remote-tracking branch 'public/bug19152_024_v2' into maint-0.2.4
src/common/crypto.c