commit 94e3555187d44d8a4c87421654a2288a3525fdc4 Merge: 12e26a6 0630f19 Author: Nick Mathewson nickm@torproject.org Date: Tue Apr 19 14:05:51 2016 -0400

Merge remote-tracking branch 'public/lcov_excl'

changes/lcov_excl | 7 +++++++ doc/HACKING/WritingTests.md | 13 +++++++++++++ scripts/test/cov-diff | 4 ++-- scripts/test/cov-exclude | 28 ++++++++++++++++++++++++++++ src/common/crypto.c | 16 ++++++++++------ src/common/crypto_s2k.c | 6 ++++-- 6 files changed, 64 insertions(+), 10 deletions(-)