From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 15 Sep 2010 02:19:25 +0000 (-0400)
Subject: Merge branch 'bug1899'
X-Git-Tag: tor-0.2.2.16-alpha~9
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=60e3def3ed7428b139cfd6e36517f930a84bd085;p=thirdparty%2Ftor.git

Merge branch 'bug1899'
---

60e3def3ed7428b139cfd6e36517f930a84bd085