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

[nickm@xxxxxxxxxxxxxx]

commit 929074b368fe94cbe74a49e5353a35f60c6623af
Merge: 0539c34 b3c988f
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Mon Nov 21 10:52:38 2011 -0500

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

 changes/bug3963 |    5 +++++
 src/or/ntmain.c |    2 +-
 2 files changed, 6 insertions(+), 1 deletions(-)

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits