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

[tor-commits] [tor/master] Merge remote-tracking branch 'tor-gitlab/mr/192'

To: tor-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [tor/master] Merge remote-tracking branch 'tor-gitlab/mr/192'
From: ahf@xxxxxxxxxxxxxx
Date: Mon, 9 Nov 2020 14:15:32 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Mon, 09 Nov 2020 09:15:44 -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: Alexander Færøy <ahf@xxxxxxxxxxxxxx>
Sender: "tor-commits" <tor-commits-bounces@xxxxxxxxxxxxxxxxxxxx>

commit 0702cf10db0ab0824d8d4d5df467fb15fc832f2e
Merge: 5e65a746aa 31d542a9c6
Author: Alexander FÃ¦rÃ¸y <ahf@xxxxxxxxxxxxxx>
Date:   Mon Nov 9 14:15:03 2020 +0000

    Merge remote-tracking branch 'tor-gitlab/mr/192'

 .gitlab-ci.yml         | 1 +
 src/core/or/include.am | 1 +
 2 files changed, 2 insertions(+)

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

Next by Author: [tor-commits] [tor/maint-0.4.5] Make config/parse_tcp_proxy_line work in the presence of DNS hijacking
Previous by thread: [tor-commits] [tor/master] or: Missing .inc file in include.am
Next by thread: [tor-commits] [tor/master] Merge remote-tracking branch 'tor-gitlab/mr/193'
Index(es):
- Author
- Thread