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

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

To: tor-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [tor/master] Merge branch 'maint-0.3.5' into maint-0.4.4
From: nickm@xxxxxxxxxxxxxx
Date: Tue, 16 Mar 2021 13:19:09 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Tue, 16 Mar 2021 09:20:44 -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 5fac24053d1615260a4ee437a9686c82262e47a8
Merge: f2cfd1ffad 3271c0bde7
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Tue Mar 16 09:17:40 2021 -0400

    Merge branch 'maint-0.3.5' 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] Move ServerTransport* options to 'Server Options' section.
Next by Author: [tor-commits] [tor/release-0.4.4] Copy 0.4.4.8 changelog to releasenotes
Previous by thread: [tor-commits] [tor/master] Merge branch 'maint-0.3.5' into maint-0.4.4
Next by thread: [tor-commits] [tor/master] Merge branch 'tor-gitlab/mr/328'
Index(es):
- Author
- Thread