[tor-commits] [tor/master] Merge branch 'maint-0.3.1'

nickm at torproject.org nickm at torproject.org
Fri Jan 19 15:19:06 UTC 2018

Previous message (by thread): [tor-commits] [tor/master] Work around Travis CI ptrace regression
Next message (by thread): [tor-commits] [tor/master] Merge remote-tracking branch 'tlyu-github/travis-workaround-031' into maint-0.3.1
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

commit 9652c65fa3b9b3346d346daea05c8b3c22b3e125
Merge: 2c9e0a286 483a59ec2
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Jan 19 10:18:35 2018 -0500

    Merge branch 'maint-0.3.1'
    
    "ours" merge to avoid the 0.3.1 version of the 24863 fix.

Previous message (by thread): [tor-commits] [tor/master] Work around Travis CI ptrace regression
Next message (by thread): [tor-commits] [tor/master] Merge remote-tracking branch 'tlyu-github/travis-workaround-031' into maint-0.3.1
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

More information about the tor-commits mailing list