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

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

To: tor-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [tor/master] Merge branch 'maint-0.4.1'
From: nickm@xxxxxxxxxxxxxx
Date: Wed, 19 Jun 2019 18:30:23 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Wed, 19 Jun 2019 14:30:38 -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 70415c9f729847a56e7feefe75e77b2cb96d4667
Merge: 91c7d395c 4ecd09cfb
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Wed Jun 19 14:29:22 2019 -0400

    Merge branch 'maint-0.4.1'
    
    "ours" merge to avoid taking pracktracker removal.

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

Prev by Author: [tor-commits] [tor/release-0.4.1] Merge branch 'maint-0.4.1' into release-0.4.1
Next by Author: [tor-commits] [tor/master] Merge branch 'bug30781_040' into bug30781_master
Previous by thread: [tor-commits] [tor/master] Merge branch 'maint-0.4.1'
Next by thread: [tor-commits] [tor/master] Merge branch 'maint-0.4.1'
Index(es):
- Author
- Thread