commit d849559d2527cd4e1f9608673f351c9e9ae0a4ee Merge: fe9c514 3dff6ac Author: Erinn Clark <erinn at torproject.org> Date: Fri May 11 20:09:48 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 build-scripts/windows.mk | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)