From: Roger Dingledine <arma@torproject.org>
Date: Fri, 2 Sep 2011 11:23:37 +0000 (-0400)
Subject: Merge branch 'maint-0.2.2'
X-Git-Tag: tor-0.2.3.3-alpha~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fe0fa91164bf1f8f305fc048b472fb6445551533;p=thirdparty%2Ftor.git

Merge branch 'maint-0.2.2'
---

fe0fa91164bf1f8f305fc048b472fb6445551533