[tor-commits] [torbrowser/master] Merge branch 'maint-2.4'

[mikeperry at torproject.org]

commit 60b1fd96a060982210b88bb0d4b8d0759164da79
Merge: aec197e a3903bc
Author: Mike Perry <mikeperry-git at fscked.org>
Date:   Sun Mar 31 23:04:57 2013 -0700

    Merge branch 'maint-2.4'

 .../0008-Disable-SSL-Session-ID-tracking.patch     |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)