commit cd10013218a6b1cc42568eb91ed9372e6caddf1f Merge: 5ffa710 95af915 Author: Nick Mathewson nickm@torproject.org Date: Fri Dec 2 00:24:33 2011 -0500

Merge remote-tracking branch 'sebastian/coverity_strlen_fp'

src/common/crypto.c | 7 +++++-- src/test/test_config.c | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-)