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

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

To: tor-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [tor/master] Merge branch 'maint-0.4.3'
From: teor@xxxxxxxxxxxxxx
Date: Thu, 9 Apr 2020 01:08:22 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Wed, 08 Apr 2020 21:08:49 -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: teor <teor@xxxxxxxxxxxxxx>
Sender: "tor-commits" <tor-commits-bounces@xxxxxxxxxxxxxxxxxxxx>

commit 4e3a17facdf67dc5634f2899a7839b99b515fe63
Merge: 59819b291 f6efb3a18
Author: teor <teor@xxxxxxxxxxxxxx>
Date:   Thu Apr 9 11:06:51 2020 +1000

    Merge branch 'maint-0.4.3'
    
    "ours" merge, to avoid taking PR 1854, which reverts
    "Prefer IPv6 by default"  for 0.4.3 only.

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

Prev by Author: [tor-commits] [tor/master] Add a "location" field for subsystems to declare which file they are in.
Next by Author: [tor-commits] [tor/release-0.4.1] dos: Pass transport name on new client connection
Previous by thread: [tor-commits] [tor/master] Merge branch 'maint-0.4.3'
Next by thread: [tor-commits] [tor/master] Merge branch 'maint-0.4.3'
Index(es):
- Author
- Thread