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

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

To: tor-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [tor/maint-0.3.5] Merge branch 'maint-0.2.9' into maint-0.3.5
From: nickm@xxxxxxxxxxxxxx
Date: Tue, 17 Sep 2019 23:00:22 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Tue, 17 Sep 2019 19:00:37 -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 2ebe1fcd52778ea2d305331f4283366eb35c9d93
Merge: 97f7efa9e 484710f25
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Tue Sep 17 18:57:49 2019 -0400

    Merge branch 'maint-0.2.9' into maint-0.3.5
    
    "ours" merge to avoid picking up 0.2.9 version of ticket 31673.




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

Prev by Author: [tor-commits] [tor/master] hs-v3: Don't apply DoS defenses if circuit has not been flagged
Next by Author: [tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/1349'
Previous by thread: [tor-commits] [tor/maint-0.3.5] Merge remote-tracking branch 'tor-github/pr/1307' into maint-0.3.5
Next by thread: [tor-commits] [tor/maint-0.3.5] Merge branch 'maint-0.2.9' into maint-0.3.5
Index(es):
- Author
- Thread