commit 4f99b60629bd66a0b4ac8352ca6aab2a63a1229c Merge: 722cec3 fb9824f Author: Erinn Clark erinn@torproject.org Date: Tue Jun 5 15:55:10 2012 -0300

Merge branch 'maint-2.2' into maint-2.3

build-scripts/config/dot_mozconfig | 1 + build-scripts/linux.mk | 7 ++----- build-scripts/windows.mk | 9 +++++---- 3 files changed, 8 insertions(+), 9 deletions(-)