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

[tor-commits] [tor/release-0.4.4] Merge branch 'maint-0.4.3' into maint-0.4.4

To: tor-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [tor/release-0.4.4] Merge branch 'maint-0.4.3' into maint-0.4.4
From: nickm@xxxxxxxxxxxxxx
Date: Wed, 12 Aug 2020 12:40:36 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Wed, 12 Aug 2020 08:41:50 -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 670f5632a54e5ae119e9d92eaebc583aab3fe0d1
Merge: 537be1da33 489d33e190
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Wed Aug 12 08:40:10 2020 -0400

    Merge branch 'maint-0.4.3' into maint-0.4.4
    
    "ours" merge to avoid MR 122 -- we already merged MR 123.




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

Prev by Author: [tor-commits] [tor/maint-0.4.4] CI: Remove VS2015 AppVeyor build.
Next by Author: [tor-commits] [tor/release-0.3.5] CI: Remove VS2015 AppVeyor build.
Previous by thread: [tor-commits] [tor/release-0.4.4] Merge branch 'maint-0.4.3' into maint-0.4.4
Next by thread: [tor-commits] [tor/release-0.4.4] Merge branch 'maint-0.4.3' into maint-0.4.4
Index(es):
- Author
- Thread