Merge branch 'bug19152_024_v2' into maint-0.2.8
commitfdfc528f85c11a1d29b6a67e32180278d1ca7cbb
authorNick Mathewson <nickm@torproject.org>
Wed, 25 May 2016 13:26:45 +0000 (25 09:26 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 25 May 2016 13:26:45 +0000 (25 09:26 -0400)
tree4468f5d3619a35cab894aebf6f0a37e2d4066426
parent6abceca1826a018fb51e419fc4eb9721dd501acf
parentc4c4380a5e43e97ff9533aa42c73183dd1054c41
Merge branch 'bug19152_024_v2' into maint-0.2.8
src/common/crypto.c