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

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

To: tor-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [tor/release-0.4.2] Merge branch 'maint-0.4.1' into maint-0.4.2
From: nickm@xxxxxxxxxxxxxx
Date: Tue, 11 Feb 2020 13:53:59 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Tue, 11 Feb 2020 08:54:40 -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 00fe214729b935adc522883fa84b399429fefa74
Merge: 0c90fc37e 0ff3e8f4a
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Tue Feb 11 08:53:00 2020 -0500

    Merge branch 'maint-0.4.1' into maint-0.4.2
    
    "ours" merge, since the exceptions.txt file is already fixed in this branch.




_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

Prev by Author: [tor-commits] [tor/master] Merge branch 'bug33212_035' into maint-0.3.5
Next by Author: [tor-commits] [tor/master] Wipe the entire hashent structure, not just the first sizeof(void*)
Previous by thread: [tor-commits] [tor/release-0.4.2] Merge branch 'maint-0.4.1' into maint-0.4.2
Next by thread: [tor-commits] [tor/release-0.4.2] Merge branch 'maint-0.4.1' into maint-0.4.2
Index(es):
- Author
- Thread