[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: Mon, 14 Sep 2020 17:18:11 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Mon, 14 Sep 2020 13:18:20 -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 56583f96e9a5cae0c8ee7c6fe94c2a01d7010ed2
Merge: 33380f6b27 f6b8894726
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Mon Sep 14 13:17:45 2020 -0400

    Merge branch 'maint-0.4.4'
    
    "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.3] Merge branch 'maint-0.3.5' into maint-0.4.3
Next by Author: [tor-commits] [tor/master] state-contents.txt: try to document circ-build-timeout fields
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