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

[tor-commits] [tor/release-0.3.0] Merge branch 'maint-0.2.5' into maint-0.2.8

To: tor-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [tor/release-0.3.0] Merge branch 'maint-0.2.5' into maint-0.2.8
From: nickm@xxxxxxxxxxxxxx
Date: Fri, 1 Dec 2017 14:06:05 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Fri, 01 Dec 2017 13:01:30 -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 2e219291bee2d378344286ba091ba09527b07188
Merge: ba4a9cf0c 6bda6777c
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Thu Nov 30 12:21:36 2017 -0500

    Merge branch 'maint-0.2.5' into maint-0.2.8
    
    "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.3.2] Another attempt at fixing the STACK warning in tortls.c
Next by Author: [tor-commits] [tor/master] control: Don't check if Server is an HSDir for HSPOST
Previous by thread: [tor-commits] [tor/maint-0.3.2] version bump to 0.3.0.13
Next by thread: [tor-commits] [tor/release-0.3.0] Merge branch 'maint-0.2.5' into maint-0.2.8
Index(es):
- Author
- Thread