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

[tor-commits] [tor/master] Merge branch 'maint-0.2.9'

To: tor-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [tor/master] Merge branch 'maint-0.2.9'
From: nickm@xxxxxxxxxxxxxx
Date: Mon, 19 Dec 2016 15:15:42 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Mon, 19 Dec 2016 10:39:28 -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 157e6a293273b9f899384ee8da7550799308817b
Merge: 5e6c338 897d3c6
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Mon Dec 19 10:13:29 2016 -0500

    Merge branch 'maint-0.2.9'
    
    "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] Teach channel_rsa_id_group_set_badness_() about Ed25519
Next by Author: [tor-commits] [tor/release-0.2.4] Merge branch 'maint-0.2.4' into release-0.2.4
Previous by thread: [tor-commits] [tor/master] Merge branch 'maint-0.2.9'
Next by thread: [tor-commits] [tor/master] Merge branch 'maint-0.2.9'
Index(es):
- Author
- Thread