[tor-commits] [tor/release-0.3.1] Merge branch 'maint-0.3.0' into maint-0.3.1

nickm at torproject.org nickm at torproject.org
Mon Dec 11 21:44:00 UTC 2017

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

commit 8e100d1a17d497d99c10c13db53442ff9e56063f
Merge: 5c03bb7c0 c55a05423
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Dec 11 16:43:24 2017 -0500

    Merge branch 'maint-0.3.0' into maint-0.3.1
    
    "ours" merge to avoid taking the 030 version of 23862.

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

More information about the tor-commits mailing list