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

[tor-commits] [tor/maint-0.3.1] Merge branch 'maint-0.3.0' into maint-0.3.1

To: tor-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [tor/maint-0.3.1] Merge branch 'maint-0.3.0' into maint-0.3.1
From: nickm@xxxxxxxxxxxxxx
Date: Fri, 1 Dec 2017 17:13:47 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Fri, 01 Dec 2017 12:14:15 -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 5c03bb7c0ca55a17dae64d4a9d05dd88b3d712c8
Merge: 7fae562a4 3bca705c5
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Fri Dec 1 12:13:40 2017 -0500

    Merge branch 'maint-0.3.0' into maint-0.3.1

 changes/bug24480     | 3 +++
 src/or/rendservice.c | 2 +-
 2 files changed, 4 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.2.9] hs-v2: Remove any expiring intro from the retry list
Next by Author: [tor-commits] [tor/master] forward-port changelogs and releasenotes
Previous by thread: [tor-commits] [tor/maint-0.3.1] Merge branch 'maint-0.3.0' into maint-0.3.1
Next by thread: [tor-commits] [tor/maint-0.3.1] Merge branch 'maint-0.3.0' into maint-0.3.1
Index(es):
- Author
- Thread