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

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

To: tor-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [tor/master] Merge branch 'maint-0.4.4'
From: nickm@xxxxxxxxxxxxxx
Date: Tue, 11 Aug 2020 21:47:28 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Tue, 11 Aug 2020 17:47:42 -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 ea0a704d52a39873a42ef2770b2b0614252740d5
Merge: e93ff481f9 1770d1c216
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Tue Aug 11 17:47:02 2020 -0400

    Merge branch 'maint-0.4.4'
    
    "ours" merge 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.4] Try disabling "make all" when checking docs.
Next by Author: [tor-commits] [tor/release-0.4.3] Add a pair of warnings about only editing CI in 035
Previous by thread: [tor-commits] [tor/master] Merge branch 'maint-0.4.4'
Next by thread: [tor-commits] [tor/master] Merge branch 'maint-0.4.4'
Index(es):
- Author
- Thread