From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 7 Oct 2011 20:49:52 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/maint-0.2.2'
X-Git-Tag: tor-0.2.3.6-alpha~35
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=19f1d3e331dfa34ab78d9bb90c61674e49ceae52;p=thirdparty%2Ftor.git

Merge remote-tracking branch 'origin/maint-0.2.2'

This merge is here to take a commit (feature 3951) that we already
have in master, so use "merge -s ours"
---

19f1d3e331dfa34ab78d9bb90c61674e49ceae52