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

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

To: tor-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [tor/maint-0.4.6] Merge branch 'maint-0.4.5' into maint-0.4.6
From: nickm@xxxxxxxxxxxxxx
Date: Fri, 7 May 2021 13:44:17 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Fri, 07 May 2021 09:44:30 -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 3483d6aab5fc8c4c090ffce8cc88586b650ed57b
Merge: a42e58a284 ec0b4bdafd
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Fri May 7 09:39:45 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] Bump to 0.4.6.4-rc.
Next by Author: [tor-commits] [tor/release-0.4.5] Update geoip files to match ipfire location db, 2021/05/07.
Previous by thread: [tor-commits] [tor/maint-0.4.6] Merge branch 'maint-0.4.5' into maint-0.4.6
Next by thread: [tor-commits] [tor/maint-0.4.6] Merge branch 'maint-0.4.5' into maint-0.4.6
Index(es):
- Author
- Thread