commit 8d24c7ce32f791cc935ead466f54b1410fe0fa2d Merge: a609a4d 0f3d142 Author: Erinn Clark <erinn@torproject.org> Date: Fri Feb 1 09:43:41 2013 +0100 Merge branch 'maint-2.3' into maint-2.4 docs/buildmachine_setups/windows.txt | 125 ++++++++++++++++++++++++++++++++++ 1 files changed, 125 insertions(+), 0 deletions(-)