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

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

To: tor-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [tor/release-0.2.9] Merge branch 'maint-0.2.4' into maint-0.2.5
From: nickm@xxxxxxxxxxxxxx
Date: Tue, 20 Dec 2016 23:24:36 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Tue, 20 Dec 2016 19:04:26 -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 7d3d56e59a3df16615881007a77b77e30fecb831
Merge: db58d4d 8f857c2
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Tue Dec 20 18:19:41 2016 -0500

    Merge branch 'maint-0.2.4' into maint-0.2.5
    
    (ours merge -- there is a separate 0.2.5 patch for 20384.)




_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

Prev by Author: [tor-commits] [tor/master] Re-enable some disabled tests about switching guard_selections
Next by Author: [tor-commits] [tor/master] Update node-selection tests to consider restrictions
Previous by thread: [tor-commits] [tor/release-0.2.9] Merge branch 'maint-0.2.4' into maint-0.2.5
Next by thread: [tor-commits] [tor/release-0.2.9] Merge branch 'maint-0.2.6' into maint-0.2.7
Index(es):
- Author
- Thread