[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug9780_024_v2' into maint-0.2.4

[nickm at torproject.org]

commit 1b312f7b55bc5322f3029ad12715d9f348d44650
Merge: 0e8ee79 72c1e5a
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Oct 31 14:02:28 2013 -0400

    Merge remote-tracking branch 'public/bug9780_024_v2' into maint-0.2.4

 changes/bug9780     |    8 ++++++++
 doc/tor.1.txt       |    2 +-
 src/common/tortls.c |    4 +---
 3 files changed, 10 insertions(+), 4 deletions(-)