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

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

To: tor-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [tor/maint-0.3.0] Merge branch 'maint-0.2.9' into maint-0.3.0
From: nickm@xxxxxxxxxxxxxx
Date: Wed, 1 Mar 2017 13:20:04 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Wed, 01 Mar 2017 08:20:16 -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 5ff31ff5b34fd69383b366d38e997822f0442086
Merge: f2ca22f 7549259
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Wed Mar 1 08:19:23 2017 -0500

    Merge branch 'maint-0.2.9' into maint-0.3.0
    
    "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/master] Simplify hidden service descriptor creation
Next by Author: [tor-commits] [tor/master] Use update_approx_time() to run a test 100 days in the past.
Previous by thread: [tor-commits] [tor/master] Port 0.2.9.10 changelog and releasenotes to master
Next by thread: [tor-commits] [tor/maint-0.3.0] Merge branch 'maint-0.2.9' into maint-0.3.0
Index(es):
- Author
- Thread