[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: Mon, 11 Dec 2017 21:52:05 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Mon, 11 Dec 2017 17:31:39 -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 736e7299ce04bd96aa75c50f7dd7ecba36945917
Merge: f7b41bcdf 7fcb222ab
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Mon Dec 11 16:51:58 2017 -0500

    Merge branch 'maint-0.3.0' into maint-0.3.1

 changes/bug23985    | 9 +++++++++
 src/or/routerlist.c | 5 +++++
 2 files changed, 14 insertions(+)

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

Prev by Author: [tor-commits] [tor/master] Check the return value of hs_parse_address().
Next by Author: [tor-commits] [tor/maint-0.3.2] Merge remote-tracking branch 'dgoulet/bug24671_032_01' into maint-0.3.2
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