[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

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

To: tor-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [tor/master] Merge branch 'maint-0.3.4' into maint-0.3.5
From: nickm@xxxxxxxxxxxxxx
Date: Wed, 24 Oct 2018 16:57:31 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Wed, 24 Oct 2018 12:57:41 -0400
List-archive: <http://lists.torproject.org/pipermail/tor-commits/>
List-help: <mailto:tor-commits-request@lists.torproject.org?subject=help>
List-id: "auto: code repository commits" <tor-commits.lists.torproject.org>
List-post: <mailto:tor-commits@lists.torproject.org>
List-subscribe: <https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits>, <mailto:tor-commits-request@lists.torproject.org?subject=subscribe>
List-unsubscribe: <https://lists.torproject.org/cgi-bin/mailman/options/tor-commits>, <mailto:tor-commits-request@lists.torproject.org?subject=unsubscribe>
Patch-author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Sender: "tor-commits" <tor-commits-bounces@xxxxxxxxxxxxxxxxxxxx>

commit c78904b6302c53e0778854974c13aa4d5a499bb0
Merge: 6851a0809 b063ca060
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Wed Oct 24 12:57:14 2018 -0400

    Merge branch 'maint-0.3.4' into maint-0.3.5
    
    "ours" to avoid taking a second instance of 27797.




_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

Prev by Author: [tor-commits] [tor/release-0.3.4] Merge branch 'appveyor_pacman_fixes_034' into maint-0.3.4
Next by Author: [tor-commits] [tor/master] Use assertions so GCC LTO doesn't worry about TLS channel conversion
Previous by thread: [tor-commits] [tor/master] Merge branch 'maint-0.3.4' into maint-0.3.5
Next by thread: [tor-commits] [tor/master] Merge branch 'maint-0.3.4' into maint-0.3.5
Index(es):
- Author
- Thread