commit eec58c35482d4425fccf38d632035319b56f795e Merge: 7e1fa9d af2b6bd Author: Nick Mathewson nickm@torproject.org Date: Wed Apr 15 10:37:55 2015 -0400

Merge remote-tracking branch 'teor/fix-spaces-20150415'

src/common/crypto.h | 1 + src/test/test-memwipe.c | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-)