commit cd8f13b5cb0f91731653eba1adf0cc3ba597db6d Merge: aa7b792 840c11b Author: Nick Mathewson nickm@torproject.org Date: Wed Apr 1 13:46:50 2015 -0400

Merge branch 'bug13736'

changes/bug13736 | 5 + doc/tor.1.txt | 6 - src/common/crypto.c | 277 +++------------------------------------------ src/common/crypto.h | 4 +- src/or/config.c | 24 +--- src/or/or.h | 2 - src/test/testing_common.c | 2 +- 7 files changed, 24 insertions(+), 296 deletions(-)