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

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

To: tor-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [tor/maint-0.4.2] Merge branch 'maint-0.3.5' into maint-0.4.2
From: nickm@xxxxxxxxxxxxxx
Date: Thu, 9 Jul 2020 17:16:35 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Thu, 09 Jul 2020 13:16:47 -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 6e01d5e68506056b1c9ec6b19a60911b15512bd8
Merge: 5aaecf6d0 c9751e261
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Thu Jul 9 13:14:22 2020 -0400

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