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

[erinn at torproject.org]

commit 3fba40eb76f9b288d51f19eb00c69ad7fe7a3667
Merge: bf31618 7adcbe9
Author: Erinn Clark <erinn at torproject.org>
Date:   Sat Jun 9 05:12:13 2012 -0300

    Merge branch 'maint-2.2' into maint-2.3

 build-scripts/versions.mk                          |    2 +-
 ...Adapt-Steven-Michaud-s-Mac-crashfix-patch.patch |  532 ++++++++++++++++++++
 2 files changed, 533 insertions(+), 1 deletions(-)