[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

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

commit 7649adbce60c7ab615e233f9e9ce41c22df8134c
Merge: 6d5478a 8057b73
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Wed May 11 22:55:29 2011 -0400

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

 changes/bug3135 |    6 ++++++
 src/or/config.c |    2 +-
 2 files changed, 7 insertions(+), 1 deletions(-)

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