[tor-commits] [tor/master] Merge branch 'maint-0.2.5' into maint-0.2.6

nickm at torproject.org nickm at torproject.org
Tue Feb 28 15:42:30 UTC 2017

Previous message: [tor-commits] [tor/master] Merge branch 'maint-0.2.5' into maint-0.2.6
Next message: [tor-commits] [tor/maint-0.2.9] Merge remote-tracking branch 'public/bug17404_024' into maint-0.2.4
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

commit ccdf0b319cf83bb7dde3b3c18044ee5ea99a60ac
Merge: f7ed4a7 884b371
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Feb 28 10:25:51 2017 -0500

    Merge branch 'maint-0.2.5' into maint-0.2.6
    
    "ours" merge to avoid version bumps

Previous message: [tor-commits] [tor/master] Merge branch 'maint-0.2.5' into maint-0.2.6
Next message: [tor-commits] [tor/maint-0.2.9] Merge remote-tracking branch 'public/bug17404_024' into maint-0.2.4
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

More information about the tor-commits mailing list