From: Roger Dingledine <arma@torproject.org>
Date: Sat, 23 Jun 2012 19:46:29 +0000 (-0400)
Subject: Merge branch 'maint-0.2.3'
X-Git-Tag: tor-0.2.4.1-alpha~121
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=95ad59fa79cba73a6916b5deccee12b541d5f756;p=thirdparty%2Ftor.git

Merge branch 'maint-0.2.3'
---

95ad59fa79cba73a6916b5deccee12b541d5f756