commit 43454a872efbc09d35c7bdaf0aef1bd493b01165 Merge: 98402d0 ccd8289 Author: Roger Dingledine arma@torproject.org Date: Thu Jan 5 18:28:27 2012 -0500

Merge branch 'maint-0.2.2' into release-0.2.2

changes/bug4822 | 13 +++++++++++++ src/common/tortls.c | 37 ++++++++++++++++++++++++++++++++++--- 2 files changed, 47 insertions(+), 3 deletions(-)