commit 4a7962e439312b5002e05e0c720245e8359ad808 Merge: 4a9bc56 62a49c0 Author: Nick Mathewson nickm@torproject.org Date: Wed Oct 24 22:07:10 2012 -0400

Merge remote-tracking branch 'public/bug7189_tentative'

changes/bug7189_server_only | 5 +++++ src/common/tortls.c | 7 +++++-- 2 files changed, 10 insertions(+), 2 deletions(-)