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

[tor-commits] [tor/master] Merge branch 'maint-0.2.5' into maint-0.2.6

To: tor-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [tor/master] Merge branch 'maint-0.2.5' into maint-0.2.6
From: nickm@xxxxxxxxxxxxxx
Date: Mon, 5 Jun 2017 18:50:27 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Mon, 05 Jun 2017 15:11:14 -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 a56cfdaba20683562e5793d6bded58a591afb04c
Merge: 9ea3d08 2e5220c
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Mon Jun 5 14:39:06 2017 -0400

    Merge branch 'maint-0.2.5' into maint-0.2.6
    
    Ours merge to avoid taking 4ee48cb434c46d9e4c477dabd8a97f03e3db221d




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

Prev by Author: [tor-commits] [tor/maint-0.2.8] Merge branch 'maint-0.2.6' into maint-0.2.7-redux
Next by Author: [tor-commits] [tor/maint-0.3.0] Fix undefined behavior in geoip_parse_entry().
Previous by thread: [tor-commits] [tor/master] Merge branch 'maint-0.2.5' into maint-0.2.6
Next by thread: [tor-commits] [tor/master] Merge branch 'maint-0.2.5' into maint-0.2.6
Index(es):
- Author
- Thread