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

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

To: tor-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [tor/master] Merge branch 'maint-0.4.5' into master
From: nickm@xxxxxxxxxxxxxx
Date: Mon, 23 Nov 2020 19:04:43 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Mon, 23 Nov 2020 14:05:00 -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 ff2b7ae1f3f6066c501b1c4099e3d20dd0533acb
Merge: bff3c6f48d 2f87b2ab75
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Mon Nov 23 14:04:05 2020 -0500

    Merge branch 'maint-0.4.5' into master
    
    "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/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
Next by Author: [tor-commits] [tor/master] Add the compiler name, version and libs used to compile
Previous by thread: [tor-commits] [tor/master] Merge branch 'maint-0.4.5' into master
Next by thread: [tor-commits] [tor/master] config: Really ignore non ORPorts when removing duplicates
Index(es):
- Author
- Thread