commit 45caeec9a03d7caca13ef4d6caeda23f7bb3129e Merge: ab1bc38 5b2adfb Author: Nick Mathewson <ni...@torproject.org> Date: Wed Nov 25 09:08:15 2015 -0500
Merge remote-tracking branch 'teor/comments-20151123' src/common/crypto.c | 49 +++++++++++++++++++++++++++---------------------- src/or/config.c | 6 +++--- src/or/or.h | 2 +- 3 files changed, 31 insertions(+), 26 deletions(-) _______________________________________________ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits