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

[nickm@xxxxxxxxxxxxxx]

commit 9452b65680deee698dbc8c4eae929aba3b75b198
Merge: d4489a2 0cc7a63
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Wed Nov 9 10:28:43 2011 -0500

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

 changes/bug4437     |    5 +++++
 src/common/compat.h |    6 +++++-
 2 files changed, 10 insertions(+), 1 deletions(-)

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