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

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

To: tor-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [tor/master] Merge branch 'maint-0.4.2' into maint-0.4.3
From: nickm@xxxxxxxxxxxxxx
Date: Thu, 9 Jul 2020 17:16:35 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Thu, 09 Jul 2020 13:17:19 -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 42c0358ceb2b030e9b9f751ad02ddd82b5912038
Merge: 7ba849349 49b4d1765
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Thu Jul 9 13:14:58 2020 -0400

    Merge branch 'maint-0.4.2' into maint-0.4.3
    
    `-s 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/master] Carry TLS error strings forward to controller when reporting them.
Next by Author: [tor-commits] [tor/master] Merge branch 'maint-0.4.4'
Previous by thread: [tor-commits] [tor/master] Merge branch 'maint-0.4.2' into maint-0.4.3
Next by thread: [tor-commits] [tor/master] Merge branch 'maint-0.4.2' into maint-0.4.3
Index(es):
- Author
- Thread