[tor-commits] [tor/maint-0.2.2] Merge maint-0.2.1 for bug2402_again fixes . Use "-s ours" so we don't actually take the patch.

nickm at torproject.org nickm at torproject.org
Wed Apr 6 20:15:09 UTC 2011

Previous message: [tor-commits] [tor/maint-0.2.2] Merge remote-tracking branch 'public/bug2402_again' into maint-0.2.1
Next message: [tor-commits] [tor/master] Fix infinite recursion when connect() fails in microdesc consensus fetch
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

commit de1c36ff6062ee4b45e1e1f637a7f168e104d7b1
Merge: 9d2b384 32341ac
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Apr 6 16:15:48 2011 -0400

    Merge maint-0.2.1 for bug2402_again fixes .  Use "-s ours" so we don't actually take the patch.

Previous message: [tor-commits] [tor/maint-0.2.2] Merge remote-tracking branch 'public/bug2402_again' into maint-0.2.1
Next message: [tor-commits] [tor/master] Fix infinite recursion when connect() fails in microdesc consensus fetch
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

More information about the tor-commits mailing list