commit 7f074e08d87c4119008c2b7b9689971f00e5edf8 Merge: 252149e 353c715 Author: Nick Mathewson <nickm@torproject.org> Date: Tue Dec 8 12:35:26 2015 -0500 Merge branch 'feature13696_squashed' changes/feature13696 | 3 ++ configure.ac | 2 + src/common/crypto.c | 146 +++++++++++++++++++++++++++++++++++++++++++++----- src/common/sandbox.c | 4 ++ 4 files changed, 142 insertions(+), 13 deletions(-)