From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 30 Nov 2011 17:02:13 +0000 (-0500)
Subject: Merge branch 'ipv6_bridges_squashed'
X-Git-Tag: tor-0.2.3.9-alpha~33
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8cc8b016c87eea632c46e20d8a2dd053b606655f;p=thirdparty%2Ftor.git

Merge branch 'ipv6_bridges_squashed'
---

8cc8b016c87eea632c46e20d8a2dd053b606655f