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

[tor-commits] [tor/master] Merge branch 'ticket33678_043' into ticket33678_master

To: tor-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [tor/master] Merge branch 'ticket33678_043' into ticket33678_master
From: nickm@xxxxxxxxxxxxxx
Date: Fri, 20 Mar 2020 12:24:05 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Fri, 20 Mar 2020 08:24:17 -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: teor <teor@xxxxxxxxxxxxxx>
Sender: "tor-commits" <tor-commits-bounces@xxxxxxxxxxxxxxxxxxxx>

commit d66005ada79a69936e3e0a4bc6a420f85d84373c
Merge: 4bb06cae2 bb3df5f32
Author: teor <teor@xxxxxxxxxxxxxx>
Date:   Fri Mar 20 17:33:56 2020 +1000

    Merge branch 'ticket33678_043' into ticket33678_master
    
    Don't take the practracker disable changes from 0.4.3.




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

Prev by Author: [tor-commits] [tor/maint-0.4.2] Merge branch 'maint-0.3.5' into maint-0.4.1
Next by Author: [tor-commits] [tor/release-0.4.2] Merge remote-tracking branch 'tor-github/pr/1718/head' into maint-0.4.2
Previous by thread: [tor-commits] [tor/maint-0.4.3] practracker: Disable practracker in git hooks
Next by thread: [tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/1823/head' into maint-0.4.3
Index(es):
- Author
- Thread