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

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

To: tor-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [tor/master] Merge branch 'maint-0.3.5' into maint-0.4.3
From: nickm@xxxxxxxxxxxxxx
Date: Wed, 3 Feb 2021 18:40:01 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Wed, 03 Feb 2021 13:40:41 -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 8a17999da3626a5f9e8922277151624cd0526fba
Merge: 0d14ac1e0e 21317c9229
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Wed Feb 3 13:39:08 2021 -0500

    Merge branch 'maint-0.3.5' into maint-0.4.3
    
    "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] [torspec/master] Merge remote-tracking branch 'tor-gitlab/mr/26'
Next by Author: [tor-commits] [tor/release-0.4.4] bump to 0.4.3.8-dev
Previous by thread: [tor-commits] [tor/master] Merge branch 'maint-0.3.5' into maint-0.4.3
Next by thread: [tor-commits] [tor/master] Merge branch 'maint-0.4.4' into maint-0.4.5
Index(es):
- Author
- Thread