[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.2'

[nickm at torproject.org]

commit c58f4a86521d3d222d60787d63f6040f73a4c054
Merge: c2d03be 16dbcaf
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sun Oct 30 21:28:36 2011 -0400

    Merge remote-tracking branch 'origin/maint-0.2.2'

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