[tor-commits] [torbrowser/maint-2.3] Merge remote-tracking branch 'origin/maint-2.2' into maint-2.3

[mikeperry at torproject.org]

commit 21d3ebcdc1eeb5dcbe2725ee6c0b08ec17228c32
Merge: ea18a10 acaa131
Author: Mike Perry <mikeperry-git at fscked.org>
Date:   Wed May 2 17:58:45 2012 -0700

    Merge remote-tracking branch 'origin/maint-2.2' into maint-2.3

 .../firefox/0018-Prevent-WebSocket-DNS-leak.patch  |  132 ++++++++++++++++++++
 1 files changed, 132 insertions(+), 0 deletions(-)