[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: Thu, 14 Sep 2017 17:22:26 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Thu, 14 Sep 2017 14:41:20 -0400
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 e468498469ebb2a676e74884a34fa017fa8ac3a4
Merge: 348b225bd f7b06202c
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Thu Sep 14 13:21:52 2017 -0400

    Merge branch 'maint-0.2.9' into maint-0.3.0
    
    "ours" merge to avoid version bump.




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

Prev by Author: [tor-commits] [tor/master] Clear outbuf_flushlen when we clear a connection's outbuf
Next by Author: [tor-commits] [tor/master] bump to 0.3.1.7-dev
Previous by thread: [tor-commits] [tor/master] Merge branch 'maint-0.2.9' into maint-0.3.0
Next by thread: [tor-commits] [tor/master] Merge branch 'maint-0.2.9' into maint-0.3.0
Index(es):
- Author
- Thread