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

[tor-commits] [tor/master] Merge branch 'maint-0.3.2' into maint-0.3.3

To: tor-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [tor/master] Merge branch 'maint-0.3.2' into maint-0.3.3
From: nickm@xxxxxxxxxxxxxx
Date: Fri, 16 Feb 2018 14:56:20 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Fri, 16 Feb 2018 11:41:16 -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 6384d314fb47a088299a14b52e5f60b6e79697b4
Merge: 9f1899fdf bd71e0a0c
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Fri Feb 16 09:55:41 2018 -0500

    Merge branch 'maint-0.3.2' into maint-0.3.3
    
    "ours" merge to avoid taking 24902 a second time and having to reconcile
    all the merge conflicts.




_______________________________________________
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.3.3] Merge branch 'maint-0.2.9' into maint-0.3.1
Next by Author: [tor-commits] [tor/release-0.2.9] geoip: Increment and decrement functions for the geoip client cache
Previous by thread: [tor-commits] [tor/master] Merge branch 'maint-0.3.2' into maint-0.3.3
Next by thread: [tor-commits] [tor/master] Merge branch 'maint-0.3.2' into maint-0.3.3
Index(es):
- Author
- Thread