Merge branch 'maint-0.2.5' into maint-0.2.6
commite6965f78b80e2b83367df05e204c97f5c0929a3c
authorNick Mathewson <nickm@torproject.org>
Tue, 7 Feb 2017 13:54:54 +0000 (7 08:54 -0500)
committerNick Mathewson <nickm@torproject.org>
Tue, 7 Feb 2017 13:54:54 +0000 (7 08:54 -0500)
treef833c83b2252897c672302a177411b851687f6f1
parent8936c50d83f3a90fb6bb3314b86f56f46d42d749
parent6b37512dc76152926a16d93f2be52083cd5ae436
Merge branch 'maint-0.2.5' into maint-0.2.6
src/common/crypto.c