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

[erinn at torproject.org]

commit 96b72fe20189d924e5439527d1cceec263b3dfd1
Merge: 60acc4d 7fc2ee5
Author: Erinn Clark <erinn at torproject.org>
Date:   Mon Dec 3 16:28:51 2012 +0000

    Merge branch 'maint-2.3' into maint-2.4

 build-scripts/windows.mk |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)