]> git.ipfire.org Git - thirdparty/tor.git/commit
Merge remote-tracking branch 'sebastian/win_warning' into maint-0.2.2
authorNick Mathewson <nickm@torproject.org>
Thu, 5 May 2011 00:33:16 +0000 (20:33 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 5 May 2011 00:33:16 +0000 (20:33 -0400)
commitab1460f3ae00f6caab9feead455eebfb0d03d5e4
treef2257e706d47b84ec20007067b866badf7699681
parent0ee524b57f35460229725c7a43f28ab73bfaa3fa
parent9a490bb53b98efa4cec721a80fe5fec94c554c1f
Merge remote-tracking branch 'sebastian/win_warning' into maint-0.2.2