From: Roger Dingledine <arma@torproject.org>
Date: Sun, 25 Dec 2011 22:43:09 +0000 (-0500)
Subject: Merge remote-tracking branch 'nickm/prop110_v2'
X-Git-Tag: tor-0.2.3.11-alpha~67
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3aade2fab7030211b7a8ae6ab1bd310c378be462;p=thirdparty%2Ftor.git

Merge remote-tracking branch 'nickm/prop110_v2'
---

3aade2fab7030211b7a8ae6ab1bd310c378be462