Merge branch 'maint-0.2.4' into maint-0.2.5
commit6b37512dc76152926a16d93f2be52083cd5ae436
authorNick Mathewson <nickm@torproject.org>
Tue, 7 Feb 2017 13:54:47 +0000 (7 08:54 -0500)
committerNick Mathewson <nickm@torproject.org>
Tue, 7 Feb 2017 13:54:47 +0000 (7 08:54 -0500)
tree1030b477a53f6a520fb0138d7782df4ed0599b3d
parent05ec055c417c80bf7b13914fade70a72f11accc5
parentd6eae78e2928544ad634356887c7a83a2cd23eaa
Merge branch 'maint-0.2.4' into maint-0.2.5
src/common/crypto.c