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

[tor-commits] [tor/maint-0.4.1] Merge branch 'maint-0.3.5' into maint-0.4.1

To: tor-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [tor/maint-0.4.1] Merge branch 'maint-0.3.5' into maint-0.4.1
From: nickm@xxxxxxxxxxxxxx
Date: Wed, 18 Mar 2020 16:18:52 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Wed, 18 Mar 2020 12:19:04 -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 cb69a5a1184e1b02523308c6d51b0f8f715f064e
Merge: efdbf4243 3150c3035
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Wed Mar 18 12:16:59 2020 -0400

    Merge branch 'maint-0.3.5' into maint-0.4.1
    
    "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] ht.h: Require a semicolon after HT_PROTOTYPE and HT_GENERATE[2]
Next by Author: [tor-commits] [tor/maint-0.4.1] Merge branch 'trove_2020_002_035' into maint-0.3.5
Previous by thread: [tor-commits] [tor/maint-0.4.1] Merge branch 'maint-0.3.5' into maint-0.4.1
Next by thread: [tor-commits] [tor/maint-0.4.2] Merge branch 'maint-0.4.1' into maint-0.4.2
Index(es):
- Author
- Thread