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

[tor-commits] [tor/master] Merge branch 'maint-0.4.5'

To: tor-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [tor/master] Merge branch 'maint-0.4.5'
From: nickm@xxxxxxxxxxxxxx
Date: Tue, 12 Jan 2021 21:10:09 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Tue, 12 Jan 2021 16:10:22 -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 4c049ca5d78274d5fb6706c0e55dfc401b3c4711
Merge: 42e95c8d85 01be7cc535
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Tue Jan 12 16:09:48 2021 -0500

    Merge branch 'maint-0.4.5'
    
    "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 branch 'maint-0.3.5' into maint-0.4.3
Next by Author: [tor-commits] [tor/release-0.4.5] Merge branch 'maint-0.4.5' into release-0.4.5
Previous by thread: [tor-commits] [tor/master] Merge branch 'maint-0.4.5'
Next by thread: [tor-commits] [tor/master] Merge branch 'maint-0.4.5'
Index(es):
- Author
- Thread