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

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

To: tor-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [tor/master] Merge branch 'maint-0.3.4' into maint-0.3.5
From: nickm@xxxxxxxxxxxxxx
Date: Thu, 15 Nov 2018 21:56:17 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Thu, 15 Nov 2018 20:34:11 -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 8af8ecabbe429503a4ff9d5510df610907c6e45a
Merge: c0e18d2f8 15e752e6b
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Thu Nov 15 16:55:42 2018 -0500

    Merge branch 'maint-0.3.4' into maint-0.3.5
    
    "ours" merge to avoid duplicating conflict resolution in merge of 24104




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

Prev by Author: [tor-commits] [tor/maint-0.3.4] Merge branch 'bug25573-034-typefix' into maint-0.3.4
Next by Author: [tor-commits] [tor/master] Merge branch 'maint-0.3.2' into maint-0.3.3
Previous by thread: [tor-commits] [tor/master] Merge branch 'maint-0.3.4' into maint-0.3.5
Next by thread: [tor-commits] [tor/master] Merge branch 'maint-0.3.4' into maint-0.3.5
Index(es):
- Author
- Thread