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

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

To: tor-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [tor/master] Merge branch 'maint-0.4.2'
From: nickm@xxxxxxxxxxxxxx
Date: Thu, 24 Oct 2019 19:55:56 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Thu, 24 Oct 2019 15:56:10 -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 68e1ced607eaed3105b4b3967e2f6af5070da0e4
Merge: d0c97bf3b 570d1367e
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Thu Oct 24 15:55:38 2019 -0400

    Merge branch 'maint-0.4.2'
    
    "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/master] Forward-port the changelog for 0.4.2.3-alpha
Next by Author: [tor-commits] [tor/master] Move code to add default log into quiet_level.c
Previous by thread: [tor-commits] [tor/master] Merge branch 'maint-0.4.2'
Next by thread: [tor-commits] [tor/master] Merge branch 'maint-0.4.2'
Index(es):
- Author
- Thread