commit 16dbcafb06205bd193bc2656dfbdaf20865ab203 Merge: c5c5f85 a6ea349 Author: Nick Mathewson nickm@torproject.org Date: Sun Oct 30 21:28:19 2011 -0400

Merge remote-tracking branch 'erinn/win-bundle-fix' into maint-0.2.2

changes/win-bundle-path | 4 ++++ contrib/package_nsis-mingw.sh | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-)