commit 6709a1f58d56f0f7e97d9fdc07e7dc8cae63a33a Merge: 3ddbf28 c08b479 Author: Nick Mathewson <nickm@torproject.org> Date: Sun Mar 23 15:57:56 2014 -0400 Merge remote-tracking branch 'arma/bug11276' src/common/crypto.c | 3 +++ 1 file changed, 3 insertions(+)