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

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

To: tor-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [tor/master] Merge branch 'maint-0.4.3' into maint-0.4.4
From: nickm@xxxxxxxxxxxxxx
Date: Mon, 9 Nov 2020 22:14:22 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Mon, 09 Nov 2020 17:14:55 -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 494ced690d4db09b5660472df490f9c8512c2684
Merge: 210a94b231 3d3dc08ed8
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Mon Nov 9 17:13:41 2020 -0500

    Merge branch 'maint-0.4.3' into maint-0.4.4
    
    "-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.4] Start ChangeLog for 0.4.4.6
Next by Author: [tor-commits] [tor/master] relay: Use testing circuit instead of dummy descriptor fetch
Previous by thread: [tor-commits] [tor/master] Merge branch 'maint-0.4.3' into maint-0.4.4
Next by thread: [tor-commits] [tor/master] Merge branch 'maint-0.4.3' into maint-0.4.4
Index(es):
- Author
- Thread