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

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

To: tor-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [tor/master] Merge branch 'maint-0.4.2'
From: teor@xxxxxxxxxxxxxx
Date: Tue, 12 Nov 2019 00:11:54 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Mon, 11 Nov 2019 19:12:05 -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: teor <teor@xxxxxxxxxxxxxx>
Sender: "tor-commits" <tor-commits-bounces@xxxxxxxxxxxxxxxxxxxx>

commit 3d6ec40e6a0ad2658a49a1b02bbf93f1a731fe73
Merge: 3d1a7d7dd 2ee04fc30
Author: teor <teor@xxxxxxxxxxxxxx>
Date:   Tue Nov 12 10:07:46 2019 +1000

    Merge branch 'maint-0.4.2'
    
    "git merge --strategy ours", because:
    * 32295 is a quick fix for 0.4.2 only
    * 32404 has a better implementation for master




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

Prev by Author: [tor-commits] [tor/master] Merge branch 'maint-0.4.2'
Next by Author: [tor-commits] [tor/maint-0.4.1] Merge branch 'maint-0.4.0' into maint-0.4.1
Previous by thread: [tor-commits] [tor/master] Merge branch 'maint-0.4.2'
Next by thread: [tor-commits] [tor/master] Merge branch 'maint-0.4.2'
Index(es):
- Author
- Thread