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

nickm at torproject.org nickm at torproject.org
Thu May 12 02:55:57 UTC 2011


commit 7649adbce60c7ab615e233f9e9ce41c22df8134c
Merge: 6d5478a 8057b73
Author: Nick Mathewson <nickm at torproject.org>
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(-)



More information about the tor-commits mailing list