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

[tor-commits] [tor/maint-0.3.1] Merge branch 'maint-0.2.9' into maint-0.3.1

To: tor-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [tor/maint-0.3.1] Merge branch 'maint-0.2.9' into maint-0.3.1
From: nickm@xxxxxxxxxxxxxx
Date: Fri, 16 Feb 2018 13:51:47 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Fri, 16 Feb 2018 08:52:53 -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 3930ffdf63425c344e14c45cff6780108cfa038b
Merge: d21e5cfc2 2b99350ca
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Fri Feb 16 08:47:12 2018 -0500

    Merge branch 'maint-0.2.9' into maint-0.3.1
    
    "ours" merge to avoid conflicts with the cherry-picked fix for 24898.

_______________________________________________
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.2.9] Merge branch 'ticket25122_029_02' into ticket24902_029_05
Next by Author: [tor-commits] [tor/maint-0.3.2] Merge remote-tracking branch 'dgoulet/bug24700_032_01' into maint-0.3.2
Previous by thread: [tor-commits] [tor/maint-0.3.1] Merge branch 'maint-0.2.9' into maint-0.3.1
Next by thread: [tor-commits] [tor/maint-0.3.1] Merge branch 'maint-0.2.9' into maint-0.3.1
Index(es):
- Author
- Thread