[tor-commits] [tor/master] Merge branch 'bug4371_squashed'

[nickm at torproject.org]

commit c4a4ac7de6d32482fad36ce5af9b1e932cd506cb
Merge: 26fcb4b 69dd993
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Nov 15 15:58:00 2011 -0500

    Merge branch 'bug4371_squashed'

 changes/bug4371     |    3 ++
 src/common/tortls.c |   55 ++++++++++++++++++++++++++++----------------------
 src/common/tortls.h |    7 ++++-
 src/or/command.c    |    8 +++---
 4 files changed, 43 insertions(+), 30 deletions(-)