]> git.ipfire.org Git - thirdparty/tor.git/commit
Merge remote-tracking branch 'public/bug6225' into maint-0.2.3
authorNick Mathewson <nickm@torproject.org>
Mon, 25 Jun 2012 15:51:19 +0000 (11:51 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 25 Jun 2012 15:51:19 +0000 (11:51 -0400)
commit2703e072a1056edd3b68a16e045175e5bd268301
treede5e7855794f9fae8f663ce280d72c9d9f07e79d
parenta6688c574e569a2a018038414198ab440344ba95
parentffd7189b3fc015ce47e6ab27ac85d4eab2183a2b
Merge remote-tracking branch 'public/bug6225' into maint-0.2.3