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

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

To: tor-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [tor/master] Merge branch 'maint-0.4.3'
From: nickm@xxxxxxxxxxxxxx
Date: Tue, 11 Feb 2020 00:44:21 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Mon, 10 Feb 2020 19:44: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 dac185edbae6b4802e517d744891bb831e863880
Merge: dcbf6611d 5d56c1f4b
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Mon Feb 10 19:43:17 2020 -0500

    Merge branch 'maint-0.4.3'
    
    "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/master] Remember dirctory bw usage, and log it in the heartbeat
Next by Author: [tor-commits] [tor/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
Previous by thread: [tor-commits] [tor/master] Update to 0.4.3.2-alpha-dev
Next by thread: [tor-commits] [tor/master] Merge branch 'maint-0.4.3'
Index(es):
- Author
- Thread