From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 16 Nov 2011 21:23:15 +0000 (-0500)
Subject: Merge branch 'bug4457_master'
X-Git-Tag: tor-0.2.3.8-alpha~26
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2f3dad10a8db72fddd797f39a72c34e64cf3837f;p=thirdparty%2Ftor.git

Merge branch 'bug4457_master'
---

2f3dad10a8db72fddd797f39a72c34e64cf3837f