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

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

To: tor-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [tor/release-0.3.2] Merge branch 'maint-0.3.0' into maint-0.3.1
From: nickm@xxxxxxxxxxxxxx
Date: Mon, 27 Nov 2017 14:09:44 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Mon, 27 Nov 2017 09:21:27 -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 703ab95e9fb94700b6349f539c58705040ede9a8
Merge: 735855952 b1c4ab0be
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Mon Nov 27 09:09:34 2017 -0500

    Merge branch 'maint-0.3.0' into maint-0.3.1

 changes/bastet_v6 | 4 ++++
 src/or/config.c   | 1 +
 2 files changed, 5 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] Make the mark_socket_open() no-op treat the socket as used.
Next by Author: [tor-commits] [tor/maint-0.3.2] Merge branch 'maint-0.2.5' into maint-0.2.8
Previous by thread: [tor-commits] [tor/release-0.3.2] Merge branch 'maint-0.3.0' into maint-0.3.1
Next by thread: [tor-commits] [tor/release-0.3.2] Merge branch 'maint-0.3.0' into maint-0.3.1
Index(es):
- Author
- Thread