[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.0

To: tor-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [tor/master] Merge branch 'maint-0.3.5' into maint-0.4.0
From: teor@xxxxxxxxxxxxxx
Date: Thu, 5 Sep 2019 04:48:35 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Thu, 05 Sep 2019 00:48:51 -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 896a1ac50b6ab182c1e15cc5271d0b24fcb90a31
Merge: 1203e137b 046183714
Author: teor <teor@xxxxxxxxxxxxxx>
Date:   Thu Sep 5 14:47:54 2019 +1000

    Merge branch 'maint-0.3.5' into maint-0.4.0

 Makefile.am         | 2 +-
 changes/ticket31554 | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)




_______________________________________________
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.1] Bug 30649: Check that machine is absent before warn
Next by Author: [tor-commits] [tor/maint-0.3.5] test: Change "make test-stem" so it only runs the stem tests that use tor
Previous by thread: [tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/1271' into maint-0.3.5
Next by thread: [tor-commits] [tor/master] Merge branch 'maint-0.3.5' into maint-0.4.0
Index(es):
- Author
- Thread