]> git.ipfire.org Git - thirdparty/tor.git/commit
Merge remote-tracking branch 'rransom-tor/bug4426' into maint-0.2.2
authorNick Mathewson <nickm@torproject.org>
Wed, 9 Nov 2011 16:03:20 +0000 (11:03 -0500)
committerNick Mathewson <nickm@torproject.org>
Wed, 9 Nov 2011 16:03:20 +0000 (11:03 -0500)
commit8adec8705014ef7e788a1dcf5d3a4a2d85a328ed
tree388b887370c860fb5f8478079838a13d11de54dd
parent0cc7a63fc0f8e23e0dc01a36de9a369671bdd4d5
parent565463243c4e019bfd8dff965582f02a2aa05e14
Merge remote-tracking branch 'rransom-tor/bug4426' into maint-0.2.2