commit 241327b8539cf2b75ae02d5dad1bd04a4423b8a1 Merge: 53fb950 e5c15ee Author: Erinn Clark erinn@torproject.org Date: Tue May 22 21:03:59 2012 -0300

Merge branch 'maint-2.2' into maint-2.3

build-scripts/windows.mk | 5 ++++- src/current-patches/mozilla-build/start-msvc.patch | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-)