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

[tor-commits] [tor/master] Merge branch 'maint-0.4.1' into maint-0.4.2

To: tor-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [tor/master] Merge branch 'maint-0.4.1' into maint-0.4.2
From: teor@xxxxxxxxxxxxxx
Date: Wed, 23 Oct 2019 00:01:26 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Tue, 22 Oct 2019 20:01:38 -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: teor <teor@xxxxxxxxxxxxxx>
Sender: "tor-commits" <tor-commits-bounces@xxxxxxxxxxxxxxxxxxxx>

commit 65545e13452bf042087bc99e7a998427941eee79
Merge: b45048fea 8bc65cda4
Author: teor <teor@xxxxxxxxxxxxxx>
Date:   Wed Oct 23 09:59:07 2019 +1000

    Merge branch 'maint-0.4.1' into maint-0.4.2
    
    `git merge --strategy ours` to use STATIC for unit tests in
    maint-0.4.2.




_______________________________________________
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.5] Merge branch 'maint-0.3.5' into release-0.3.5
Next by Author: [tor-commits] [tor/release-0.4.2] Merge branch 'ticket32177_029' into ticket32177_035
Previous by thread: [tor-commits] [tor/master] Merge branch 'maint-0.4.1' into maint-0.4.2
Next by thread: [tor-commits] [tor/master] Merge branch 'maint-0.4.1' into maint-0.4.2
Index(es):
- Author
- Thread