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

To: tor-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [tor/maint-0.3.5] Merge branch 'maint-0.2.9' into maint-0.3.4
From: teor@xxxxxxxxxxxxxx
Date: Fri, 19 Apr 2019 02:01:34 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Thu, 18 Apr 2019 22:06:02 -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 cbce8dedd3703424111928d68dfe8920900ce054
Merge: 116970dda 2460b4461
Author: teor <teor@xxxxxxxxxxxxxx>
Date:   Fri Apr 19 11:59:18 2019 +1000

    Merge branch 'maint-0.2.9' into maint-0.3.4
    
    "ours" merge, to avoid taking any changes from PR 792 in 0.3.4.
    (We already merged PR 791 for 29665 into 0.3.4.)




_______________________________________________
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.3.4] test: Backport the 0.3.4 src/test/test-network.sh to 0.2.9
Next by Author: [tor-commits] [tor/maint-0.2.9] Handle errors from coveralls more gracefully.
Previous by thread: [tor-commits] [tor/maint-0.3.5] Merge branch 'maint-0.2.9' into maint-0.3.4
Next by thread: [tor-commits] [tor/maint-0.3.5] Merge branch 'maint-0.3.4' into maint-0.3.5
Index(es):
- Author
- Thread