commit a0e9dc9f55a452d78d9d16b4a2fc7d57dafa0409 Merge: e2549c3 8743080 Author: Nick Mathewson nickm@torproject.org Date: Fri Oct 19 00:58:33 2012 -0400

Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3

changes/bug7139 | 9 +++++++++ src/common/tortls.c | 8 ++++++++ 2 files changed, 17 insertions(+), 0 deletions(-)