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

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

To: tor-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [tor/master] Merge branch 'maint-0.3.5' into maint-0.4.1
From: nickm@xxxxxxxxxxxxxx
Date: Wed, 6 May 2020 21:19:45 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Wed, 06 May 2020 17:22:01 -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 dd0ee016e9e386410c374d0dd421f5683ec8476e
Merge: 28f453c47 cc397449f
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Wed May 6 16:51:33 2020 -0400

    Merge branch 'maint-0.3.5' into maint-0.4.1
    
    This is an "ours" merge to avoid taking the 0.3.5 fix for 34078.




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

Prev by Author: [tor-commits] [tor/master] Fix spacing in if statement in tor_version_parse()
Next by Author: [tor-commits] [tor/release-0.4.1] Replace some "fall through" comments not at the end of a case.
Previous by thread: [tor-commits] [tor/master] Merge branch 'maint-0.3.5' into maint-0.4.1
Next by thread: [tor-commits] [tor/master] Merge branch 'maint-0.3.5' into maint-0.4.1
Index(es):
- Author
- Thread