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

commit 9f1b1ef4fbc67b2d3f6e2f9b2dd4d8cd44dc49b7 Merge: 981f25a a0e9dc9 Author: Nick Mathewson <nickm@torproject.org> Date: Fri Oct 19 01:01:26 2012 -0400 Merge remote-tracking branch 'origin/maint-0.2.3' changes/bug7139 | 9 +++++++++ src/common/tortls.c | 8 ++++++++ 2 files changed, 17 insertions(+), 0 deletions(-)