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

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

To: tor-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [tor/master] Merge branch 'maint-0.2.9' into maint-0.3.0
From: nickm@xxxxxxxxxxxxxx
Date: Fri, 17 Feb 2017 16:33:23 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Fri, 17 Feb 2017 11:33:41 -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 5dbbd6bc392892df63a02cf601f94fa1fae6ebfc
Merge: 3336f26 67cec75
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Fri Feb 17 11:32:45 2017 -0500

    Merge branch 'maint-0.2.9' into maint-0.3.0

 src/or/routerparse.c | 2 +-
 1 file changed, 1 insertion(+), 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/master] Merge remote-tracking branch 'ahf/bugs/21206'
Next by Author: [tor-commits] [tor/release-0.2.8] Merge branch 'maint-0.2.6' into maint-0.2.7
Previous by thread: [tor-commits] [tor/master] Check for micro < 0, rather than checking "minor" twice.
Next by thread: [tor-commits] [tor/master] Merge branch 'maint-0.2.9' into maint-0.3.0
Index(es):
- Author
- Thread