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

[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug21128'

To: tor-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [tor/master] Merge remote-tracking branch 'public/bug21128'
From: nickm@xxxxxxxxxxxxxx
Date: Wed, 1 Feb 2017 14:09:19 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Wed, 01 Feb 2017 09:09:42 -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 f8885b76ef353c4bccc90119448df5301b3ba8cb
Merge: a5aec6a 35d8270
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Wed Feb 1 09:01:28 2017 -0500

    Merge remote-tracking branch 'public/bug21128'

 changes/bug21128    | 5 +++++
 src/or/entrynodes.c | 6 +++++-
 2 files changed, 10 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/release-0.2.5] Merge branch 'maint-0.2.4' into maint-0.2.5
Next by Author: [tor-commits] [tor/master] Edit more changelog text (thanks to rl1987 for noticing)
Previous by thread: [tor-commits] [tor/master] When marking guard state instances on a channel, don't mark NULL
Next by thread: [tor-commits] [tor/master] Merge remote-tracking branch 'public/bug21129'
Index(es):
- Author
- Thread