From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 2 Aug 2010 15:11:02 +0000 (-0400)
Subject: Merge branch 'bug1094_v2'
X-Git-Tag: tor-0.2.2.15-alpha~58
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4504640b101fbbc88632f7f5efb923b801391052;p=thirdparty%2Ftor.git

Merge branch 'bug1094_v2'
---

4504640b101fbbc88632f7f5efb923b801391052