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

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

To: tor-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [tor/master] Merge branch 'maint-0.2.9'
From: nickm@xxxxxxxxxxxxxx
Date: Mon, 12 Dec 2016 02:41:29 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Sun, 11 Dec 2016 21:41:44 -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 14edb0bd0cc97a8cab84b9e28c7bfe97b3a0cbc0
Merge: 7601edc cf6da1e
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Sun Dec 11 21:40:38 2016 -0500

    Merge branch 'maint-0.2.9'
    
    "ours" merge to avoid taking 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/release-0.2.7] Update geoip and geoip6 to the December 7 2016 database.
Next by Author: [tor-commits] [tor/release-0.2.9] Merge branch 'maint-0.2.6' into maint-0.2.7
Previous by thread: [tor-commits] [tor/master] Merge branch 'maint-0.2.9'
Next by thread: [tor-commits] [tor/master] Merge branch 'maint-0.2.9'
Index(es):
- Author
- Thread