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

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

To: tor-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [tor/master] Merge branch 'maint-0.4.5'
From: nickm@xxxxxxxxxxxxxx
Date: Mon, 15 Feb 2021 14:58:00 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Mon, 15 Feb 2021 09:58:15 -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 2ae314830428e6b5f188884c1e2f747632496b65
Merge: e74fc69448 18db584caf
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Mon Feb 15 09:55:17 2021 -0500

    Merge branch '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] [tor/master] copy stable release entries forward into changelog and releasenotes
Next by Author: [tor-commits] [tor/release-0.4.5] Merge remote-tracking branch 'tor-gitlab/mr/316' into maint-0.4.5
Previous by thread: [tor-commits] [tor/master] Merge branch 'maint-0.4.5'
Next by thread: [tor-commits] [tor/master] Merge branch 'maint-0.4.5'
Index(es):
- Author
- Thread