commit bfd9dccdb8692a8d1d04c1c4004bc4bd3236c7b1 Merge: b216340 1eb838b Author: Nick Mathewson nickm@torproject.org Date: Tue Oct 6 09:06:57 2015 -0400

Merge remote-tracking branch 'origin/maint-0.2.7'

changes/bug17237_027 | 4 ++++ changes/bug17251 | 3 +++ src/common/tortls.c | 13 +++++++++---- src/test/test_crypto_slow.c | 2 +- 4 files changed, 17 insertions(+), 5 deletions(-)