[tor-commits] [tor/release-0.3.5] Merge branch 'maint-0.3.4' into maint-0.3.5

nickm at torproject.org nickm at torproject.org
Thu Nov 15 21:56:18 UTC 2018

Previous message (by thread): [tor-commits] [tor/release-0.3.5] Merge branch 'maint-0.3.4' into maint-0.3.5
Next message (by thread): [tor-commits] [tor/release-0.3.5] Merge branch 'maint-0.3.4' into maint-0.3.5
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

commit 8af8ecabbe429503a4ff9d5510df610907c6e45a
Merge: c0e18d2f8 15e752e6b
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Nov 15 16:55:42 2018 -0500

    Merge branch 'maint-0.3.4' into maint-0.3.5
    
    "ours" merge to avoid duplicating conflict resolution in merge of 24104

Previous message (by thread): [tor-commits] [tor/release-0.3.5] Merge branch 'maint-0.3.4' into maint-0.3.5
Next message (by thread): [tor-commits] [tor/release-0.3.5] Merge branch 'maint-0.3.4' into maint-0.3.5
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

More information about the tor-commits mailing list