From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 13 Jun 2012 20:55:39 +0000 (-0400)
Subject: Merge branch 'trac-5049-squashed'
X-Git-Tag: tor-0.2.3.17-beta~16
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e3a6e01fe196fa1c1ae707065d515718795bc1d1;p=thirdparty%2Ftor.git

Merge branch 'trac-5049-squashed'
---

e3a6e01fe196fa1c1ae707065d515718795bc1d1