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

[tor-commits] [tor/release-0.4.0] Merge branch 'maint-0.3.5' into maint-0.4.0

To: tor-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [tor/release-0.4.0] Merge branch 'maint-0.3.5' into maint-0.4.0
From: nickm@xxxxxxxxxxxxxx
Date: Thu, 21 Feb 2019 18:26:15 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Thu, 21 Feb 2019 13:28:11 -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: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Sender: "tor-commits" <tor-commits-bounces@xxxxxxxxxxxxxxxxxxxx>

commit 5f44e1e5dc9a624d36e622bb943390f627b83867
Merge: 00a93b19c 955ca72f9
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Thu Feb 21 13:25:02 2019 -0500

    Merge branch 'maint-0.3.5' into maint-0.4.0
    
    "ours" to avoid version bump.




_______________________________________________
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.0] Disable unstable circuit padding unittest.
Next by Author: [tor-commits] [tor/release-0.3.3] kist: Don't write above the highwater outbuf mark
Previous by thread: [tor-commits] [tor/release-0.4.0] Merge branch 'maint-0.3.5' into maint-0.4.0
Next by thread: [tor-commits] [tor/release-0.4.0] Merge branch 'maint-0.3.5' into maint-0.4.0
Index(es):
- Author
- Thread