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

[tor-commits] [tor/release-0.3.2] Merge branch 'maint-0.3.0' into maint-0.3.1

To: tor-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [tor/release-0.3.2] Merge branch 'maint-0.3.0' into maint-0.3.1
From: nickm@xxxxxxxxxxxxxx
Date: Mon, 11 Dec 2017 21:44:00 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Mon, 11 Dec 2017 19:31:33 -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 8e100d1a17d497d99c10c13db53442ff9e56063f
Merge: 5c03bb7c0 c55a05423
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Mon Dec 11 16:43:24 2017 -0500

    Merge branch 'maint-0.3.0' into maint-0.3.1
    
    "ours" merge to avoid taking the 030 version of 23862.




_______________________________________________
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.3.2] bump to 0.3.2.7-rc-dev
Next by Author: [tor-commits] [tor/maint-0.3.2] Update geoip and geoip6 to the December 6 2017 database.
Previous by thread: [tor-commits] [tor/release-0.3.2] Merge branch 'maint-0.3.0' into maint-0.3.1
Next by thread: [tor-commits] [tor/release-0.3.2] Merge branch 'maint-0.3.0' into maint-0.3.1
Index(es):
- Author
- Thread