From: Roger Dingledine <arma@torproject.org>
Date: Fri, 7 May 2010 21:27:17 +0000 (-0400)
Subject: Merge commit 'linus/master'
X-Git-Tag: tor-0.2.2.14-alpha~45
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5add4b1d8349e83eff11743046a0b5d85e51df6c;p=thirdparty%2Ftor.git

Merge commit 'linus/master'
---

5add4b1d8349e83eff11743046a0b5d85e51df6c