From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 7 May 2012 15:09:50 +0000 (-0400)
Subject: Merge branch 'bug5645_take2'
X-Git-Tag: tor-0.2.3.16-alpha~93
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3f48c7575e7aacc7199722b992d9098a536d05af;p=thirdparty%2Ftor.git

Merge branch 'bug5645_take2'
---

3f48c7575e7aacc7199722b992d9098a536d05af