commit 941bac0dd253017fc80d724039f239135dabde1e Merge: 877c8de ada85fd Author: Erinn Clark <erinn@torproject.org> Date: Fri Mar 16 15:33:19 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 build-scripts/osx.mk | 1 - build-scripts/windows.mk | 5 ++--- 2 files changed, 2 insertions(+), 4 deletions(-)