[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.4

To: tor-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [tor/release-0.4.6] Merge branch 'maint-0.3.5' into maint-0.4.4
From: nickm@xxxxxxxxxxxxxx
Date: Mon, 14 Jun 2021 15:49:22 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Mon, 14 Jun 2021 11:54:20 -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 253b83b72223f67024ea10b4008610dd18396811
Merge: 0ae9fd62fd 87492154e0
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Mon Jun 14 11:46:20 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/main] Merge branch 'maint-0.4.6'
Next by Author: [tor-commits] [tor/main] Update geoip files to match ipfire location db, 2021/06/10.
Previous by thread: [tor-commits] [tor/release-0.4.6] Merge branch 'maint-0.3.5' into maint-0.4.4
Next by thread: [tor-commits] [tor/release-0.4.6] Bump to 0.4.5.9.
Index(es):
- Author
- Thread