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

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

To: tor-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [tor/release-0.4.6] Merge branch 'maint-0.4.5' into maint-0.4.6
From: nickm@xxxxxxxxxxxxxx
Date: Mon, 10 May 2021 14:55:29 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Mon, 10 May 2021 10:57:25 -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 0db0c5c739dc06e1e4ec1b93f7e62922a1bacfc7
Merge: e4f2b52deb ce8d6d143c
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Mon May 10 10:53:10 2021 -0400

    Merge branch 'maint-0.4.5' into maint-0.4.6
    
    "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/main] Stop using the "x$FOO" idiom in git-resquash.sh
Next by Author: [tor-commits] [tor/master] Merge branch 'maint-0.4.6'
Previous by thread: [tor-commits] [tor/release-0.4.6] Merge branch 'maint-0.4.5' into maint-0.4.6
Next by thread: [tor-commits] [tor/release-0.4.6] Merge branch 'maint-0.4.5' into maint-0.4.6
Index(es):
- Author
- Thread