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

[tor-commits] [tor/master] Merge branch 'maint-0.4.6'

To: tor-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [tor/master] Merge branch 'maint-0.4.6'
From: nickm@xxxxxxxxxxxxxx
Date: Fri, 7 May 2021 13:44:18 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Fri, 07 May 2021 09:44:42 -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 89e3028590e4fbe7cbe0948e1533bcb3c1183d6a
Merge: 93af8b1ad8 8142b368e7
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Fri May 7 09:42:39 2021 -0400

    Merge branch 'maint-0.4.6'
    
    "ours" merge 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/release-0.4.5] Update to 0.4.5.8-dev
Next by Author: [tor-commits] [tor/master] Remove NEED_SKEY_1024 parsing.
Previous by thread: [tor-commits] [tor/master] Merge branch 'maint-0.4.6'
Next by thread: [tor-commits] [tor/master] Merge branch 'maint-0.4.6'
Index(es):
- Author
- Thread