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

[tor-commits] [tor/release-0.4.6] Merge branch 'maint-0.3.5' into maint-0.4.5

To: tor-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [tor/release-0.4.6] Merge branch 'maint-0.3.5' into maint-0.4.5
From: nickm@xxxxxxxxxxxxxx
Date: Mon, 16 Aug 2021 12:22:00 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Mon, 16 Aug 2021 08:23:02 -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 1667e122def480fac8033fb96057971969a446d5
Merge: ca249131b0 2984fba97a
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Mon Aug 16 08:18:09 2021 -0400

    Merge branch 'maint-0.3.5' into maint-0.4.5
    
    "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] [torspec/main] Specify case in BEGIN messages.
Next by Author: [tor-commits] [tor/main] Make the version 0.4.5.10, not 0.4.5.10-dev.
Previous by thread: [tor-commits] [tor/release-0.4.6] Merge branch 'maint-0.3.5' into maint-0.4.5
Next by thread: [tor-commits] [tor/release-0.4.6] Merge branch 'maint-0.3.5' into maint-0.4.5
Index(es):
- Author
- Thread