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

[tor-commits] [tor/main] Merge branch 'maint-0.4.6'

To: tor-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [tor/main] Merge branch 'maint-0.4.6'
From: nickm@xxxxxxxxxxxxxx
Date: Fri, 28 May 2021 16:21:36 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Fri, 28 May 2021 12:21:51 -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 b6329e9afa97b578a131e62b7ae83c43feafb2b3
Merge: 407eb5d7cd 6ccb858058
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Fri May 28 12:21:15 2021 -0400

    Merge branch 'maint-0.4.6'
    
    "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.6] Bump to 0.4.6.3-rc-dev
Next by Author: [tor-commits] [tor/maint-0.4.5] Update to 0.4.5.8-dev
Previous by thread: [tor-commits] [tor/main] Merge branch 'maint-0.4.6'
Next by thread: [tor-commits] [tor/main] Prefer mmap()ed consensus files over cached_dir_t entries.
Index(es):
- Author
- Thread