[tor-commits] [tor/maint-0.2.2] Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2

nickm at torproject.org nickm at torproject.org
Tue Feb 22 20:58:08 UTC 2011

Previous message: [tor-commits] [tor/maint-0.2.2] Merge remote branch 'public/bug2402_nothing' into maint-0.2.1
Next message: [tor-commits] [tor/maint-0.2.2] changes file for removing torspec from the tarball
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

commit 84cdcc68a944b31a0b138fcf5ac5e9074c27ed5a
Merge: 4f730e4 7605985
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Feb 22 15:57:36 2011 -0500

    Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
    
    Use "ours" strategy" to avoid taking bug2402 fix.

Previous message: [tor-commits] [tor/maint-0.2.2] Merge remote branch 'public/bug2402_nothing' into maint-0.2.1
Next message: [tor-commits] [tor/maint-0.2.2] changes file for removing torspec from the tarball
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

More information about the tor-commits mailing list