]> git.ipfire.org Git - thirdparty/tor.git/commit
Merge remote-tracking branch 'erinn/win-bundle-fix' into maint-0.2.2
authorNick Mathewson <nickm@torproject.org>
Mon, 31 Oct 2011 01:28:19 +0000 (21:28 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 31 Oct 2011 01:28:19 +0000 (21:28 -0400)
commit16dbcafb06205bd193bc2656dfbdaf20865ab203
treef50332f786ec3ac97a1818c64de00f30d19fcfb8
parentc5c5f859d37bc46f912cca9ba0fa0e1300062e40
parenta6ea34977b0c053cfc330a207961374f58911a7f
Merge remote-tracking branch 'erinn/win-bundle-fix' into maint-0.2.2