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

[nickm at torproject.org]

commit 4dd8d811d669e245f95ed0fcc59de579e876ab91
Merge: 00a0de8 2018f86
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Oct 28 18:05:25 2011 -0400

    Merge branch 'bug4343'

 changes/bug4343     |    5 +++++
 src/common/tortls.c |    2 +-
 src/or/command.c    |    6 +++---
 3 files changed, 9 insertions(+), 4 deletions(-)