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

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

To: tor-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [tor/release-0.4.4] Merge branch 'maint-0.3.5' into maint-0.4.3
From: nickm@xxxxxxxxxxxxxx
Date: Mon, 9 Nov 2020 22:15:08 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Mon, 09 Nov 2020 17:15:40 -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 3d3dc08ed8782e88f1e87a9550b9f18751c5732a
Merge: 6338c35e9d 665083be9f
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Mon Nov 9 17:13:25 2020 -0500

    Merge branch 'maint-0.3.5' 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/release-0.4.3] Merge remote-tracking branch 'tor-gitlab/mr/189' into maint-0.3.5
Next by Author: [tor-commits] [tor/maint-0.3.5] Bump to 0.3.5.12-dev
Previous by thread: [tor-commits] [tor/release-0.4.4] Merge branch 'maint-0.3.5' into maint-0.4.3
Next by thread: [tor-commits] [tor/release-0.4.4] Merge branch 'maint-0.3.5' into maint-0.4.3
Index(es):
- Author
- Thread