[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.4'

[nickm at torproject.org]

commit 61029d69269d58e530028ee69b148581d3d8bd93
Merge: a19e3e2 1b312f7
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Oct 31 14:03:01 2013 -0400

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

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