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

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

To: tor-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [tor/master] Merge branch 'maint-0.4.1' into maint-0.4.2
From: nickm@xxxxxxxxxxxxxx
Date: Thu, 30 Jan 2020 00:45:00 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Wed, 29 Jan 2020 19:45:20 -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 0fb407591b8e5e028884aa6e07b7b1550bd0c703
Merge: 7b6be02a9 ec7f99e6e
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Wed Jan 29 19:42:43 2020 -0500

    Merge branch 'maint-0.4.1' into maint-0.4.2
    
    "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] test_util: remove UTIL_LEGACY_NO_WIN.
Next by Author: [tor-commits] [tor/master] Define a "dircache" module.
Previous by thread: [tor-commits] [tor/master] Merge branch 'maint-0.4.1' into maint-0.4.2
Next by thread: [tor-commits] [tor/master] Merge branch 'maint-0.4.1' into maint-0.4.2
Index(es):
- Author
- Thread