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

[tor-commits] [tor/release-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2

To: tor-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [tor/release-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
From: nickm@xxxxxxxxxxxxxx
Date: Mon, 23 Oct 2017 13:23:05 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Mon, 23 Oct 2017 09:23:31 -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 8b8d501040946bb2280a9640f91a55b7f17b03e3
Merge: 6a7aa4735 af33fdd7c
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Mon Oct 23 09:22:43 2017 -0400

    Merge branch 'maint-0.3.1' into maint-0.3.2
    
    "ours" merge to avoid taking af33fdd7c1860399fe8d6861c163e5d64b0292b9

_______________________________________________
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] dirauth: Add bastet to the default authorities
Next by Author: [tor-commits] [tor/maint-0.3.2] test: Add unittest for descriptors with BridgeDistribution option.
Previous by thread: [tor-commits] [tor/release-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
Next by thread: [tor-commits] [tor/release-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
Index(es):
- Author
- Thread