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

[tor-commits] [tor/maint-0.2.9] Merge branch 'maint-0.2.7-redux' into maint-0.2.8

To: tor-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [tor/maint-0.2.9] Merge branch 'maint-0.2.7-redux' into maint-0.2.8
From: nickm@xxxxxxxxxxxxxx
Date: Thu, 8 Jun 2017 14:16:38 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Thu, 08 Jun 2017 11:01:11 -0400
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 bff08ed8eb4f9c36d32ae5e15bd574052cca8d78
Merge: 792931d 4915d9c
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Thu Jun 8 09:29:05 2017 -0400

    Merge branch 'maint-0.2.7-redux' into maint-0.2.8
    
    "ours" merge to avoid version bump.




_______________________________________________
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.1] Merge branch 'maint-0.2.6' into maint-0.2.7-redux
Next by Author: [tor-commits] [tor/master] Set published_out for consensus cache entries in spooled_resource_estimate_size().
Previous by thread: [tor-commits] [tor/maint-0.2.9] Merge branch 'maint-0.2.7-redux' into maint-0.2.8
Next by thread: [tor-commits] [tor/maint-0.2.9] Merge branch 'maint-0.2.7-redux' into maint-0.2.8
Index(es):
- Author
- Thread