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

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

To: tor-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [tor/release-0.2.6] Merge branch 'maint-0.2.5' into maint-0.2.6
From: nickm@xxxxxxxxxxxxxx
Date: Tue, 28 Feb 2017 15:42:30 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Tue, 28 Feb 2017 13:24:47 -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 ccdf0b319cf83bb7dde3b3c18044ee5ea99a60ac
Merge: f7ed4a7 884b371
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Tue Feb 28 10:25:51 2017 -0500

    Merge branch 'maint-0.2.5' into maint-0.2.6
    
    "ours" merge to avoid version bumps




_______________________________________________
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.2.8] Merge branch 'maint-0.2.5' into maint-0.2.6
Next by Author: [tor-commits] [tor/master] Merge remote-tracking branch 'dgoulet/bug20980_030_01'
Previous by thread: [tor-commits] [tor/release-0.2.6] Merge branch 'maint-0.2.5' into maint-0.2.6
Next by thread: [tor-commits] [tor/release-0.2.4] Change behavior on missing/present event to warn instead of asserting.
Index(es):
- Author
- Thread