commit 0965bbd5ac3a3dc4016a0c13082506ac2039905e Merge: 03d2df6 6d728ba Author: Nick Mathewson nickm@torproject.org Date: Mon Dec 22 16:02:47 2014 -0500

Merge remote-tracking branch 'origin/maint-0.2.5'

src/common/crypto.c | 6 ++++++ src/common/util.c | 3 +++ 2 files changed, 9 insertions(+)