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

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

To: tor-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [tor/master] Merge branch 'maint-0.4.3' into maint-0.4.4
From: nickm@xxxxxxxxxxxxxx
Date: Wed, 3 Feb 2021 18:40:01 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Wed, 03 Feb 2021 13:41:06 -0500
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 2933c371887d07704fd6101b82302a8b952d638c
Merge: f3ba71bbee 8a17999da3
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Wed Feb 3 13:39:28 2021 -0500

    Merge branch 'maint-0.4.3' into maint-0.4.4
    
    "ours" to avoid version bump.




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

Prev by Author: [tor-commits] [tor/master] forward-port changelog from 0.4.5.5-rc
Next by Author: [tor-commits] [tor/master] dos: Move config options within the subsystem
Previous by thread: [tor-commits] [tor/master] Merge branch 'maint-0.4.3' into maint-0.4.4
Next by thread: [tor-commits] [tor/master] Merge branch 'maint-0.3.5' into maint-0.4.3
Index(es):
- Author
- Thread