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

[erinn at torproject.org]

commit c0f17c17116b13cc5f255a2fd8859b4f0d89186c
Merge: 241327b 2282d5a
Author: Erinn Clark <erinn at torproject.org>
Date:   Tue May 22 23:50:02 2012 -0300

    Merge branch 'maint-2.2' into maint-2.3

 build-scripts/windows.mk |    2 +-
 changelog.windows-2.2    |    6 ++++++
 2 files changed, 7 insertions(+), 1 deletions(-)