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

[tor-commits] [tor/maint-0.2.7] Merge branch 'maint-0.2.6' into maint-0.2.7

To: tor-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [tor/maint-0.2.7] Merge branch 'maint-0.2.6' into maint-0.2.7
From: nickm@xxxxxxxxxxxxxx
Date: Tue, 7 Feb 2017 14:32:06 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Tue, 07 Feb 2017 09:32:24 -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 86d5a6fac04a3f78b3bd2a8a7a1f2d9776010334
Merge: 0a43134 5446cb8
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Tue Feb 7 09:29:27 2017 -0500

    Merge branch 'maint-0.2.6' into maint-0.2.7
    
    "ours" merge to avoid reverting 17354, which was already fixed in
    0.2.7.4-rc.

_______________________________________________
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] tweak 0276 changelog; copy it into the releasenotes
Next by Author: [tor-commits] [tor/master] (this already went in to 0.3.0.3-alpha)
Previous by thread: [tor-commits] [tor/maint-0.2.7] Merge branch 'maint-0.2.6' into maint-0.2.7
Next by thread: [tor-commits] [tor/maint-0.2.7] Merge branch 'maint-0.2.6' into maint-0.2.7
Index(es):
- Author
- Thread