[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: Fri, 22 Jan 2021 15:07:13 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Fri, 22 Jan 2021 10:07:31 -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 6fff643a83a3899f676c4a3479ac898dd5790133
Merge: 74cfe3611f 5eef63aa71
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Fri Jan 22 09:49:24 2021 -0500

    Merge branch 'maint-0.4.5'
    
    "-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/maint-0.4.5] Bump to 0.4.5.5-rc
Next by Author: [tor-commits] [tor/release-0.4.5] Merge branch 'maint-0.3.5' into maint-0.4.3
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