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

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

To: tor-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [tor/release-0.4.2] Merge branch 'maint-0.3.5' into maint-0.4.1
From: nickm@xxxxxxxxxxxxxx
Date: Fri, 13 Mar 2020 20:57:50 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Fri, 13 Mar 2020 16:59:00 -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 7a9e2a261b44b93e244c04593dee8f7757ba32bc
Merge: 7f0ad3343 d17108a18
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Fri Mar 13 16:56:44 2020 -0400

    Merge branch 'maint-0.3.5' into maint-0.4.1
    
    "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/maint-0.4.2] test: Add unit test for connection_dir_is_global_write_low()
Next by Author: [tor-commits] [tor/release-0.3.5] Merge remote-tracking branch 'tor-github/pr/1693/head' into maint-0.3.5
Previous by thread: [tor-commits] [tor/release-0.4.2] Merge branch 'maint-0.3.5' into maint-0.4.1
Next by thread: [tor-commits] [tor/release-0.4.2] Merge branch 'maint-0.3.5' into maint-0.4.1
Index(es):
- Author
- Thread