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

[tor-commits] [tor/maint-0.4.2] Merge branch 'maint-0.4.1' into maint-0.4.2

To: tor-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [tor/maint-0.4.2] Merge branch 'maint-0.4.1' into maint-0.4.2
From: nickm@xxxxxxxxxxxxxx
Date: Fri, 13 Mar 2020 20:57:49 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Fri, 13 Mar 2020 16:58:17 -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 2f4fa423c30c81092f06fb97c20f5d281b3cfac7
Merge: 2c1a49c46 7a9e2a261
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Fri Mar 13 16:57:03 2020 -0400

    Merge branch 'maint-0.4.1' into maint-0.4.2
    
    "ours" 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/release-0.4.2] nodelist: Helper to add an address to the nodelist address set
Next by Author: [tor-commits] [tor/maint-0.4.2] Merge remote-tracking branch 'tor-github/pr/1718/head' into maint-0.4.2
Previous by thread: [tor-commits] [tor/maint-0.4.2] Merge branch 'maint-0.4.1' into maint-0.4.2
Next by thread: [tor-commits] [tor/maint-0.4.2] Merge branch 'maint-0.4.1' into maint-0.4.2
Index(es):
- Author
- Thread