commit cd8a62a60cbafb61bed8b64e988dacf2b1444668 Merge: 3f3a753 7b859fd Author: Nick Mathewson nickm@torproject.org Date: Wed Oct 21 13:35:04 2015 -0400

Merge branch 'maint-0.2.7' into release-0.2.7

changes/bug17364 | 3 +++ changes/bug17403 | 3 +++ changes/bug17404 | 6 ++++++ doc/tor.1.txt | 4 ++-- src/common/tortls.c | 4 ++++ src/or/routerkeys.c | 2 ++ 6 files changed, 20 insertions(+), 2 deletions(-)