commit d366c3354f4d10d2a71e837e01d6722c40854b5b Merge: cd8f13b ad3c2f1 Author: Nick Mathewson nickm@torproject.org Date: Wed Apr 1 13:53:03 2015 -0400

Merge branch 'remove_digests'

.gitignore | 2 -- changes/no_digests | 5 +++++ configure.ac | 3 --- src/common/include.am | 15 --------------- src/common/util.h | 2 -- src/common/util_codedigest.c | 13 ------------- src/or/config.c | 8 -------- src/or/config.h | 1 - src/or/config_codedigest.c | 13 ------------- src/or/include.am | 19 ++----------------- 10 files changed, 7 insertions(+), 74 deletions(-)