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

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

To: tor-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [tor/master] Merge branch 'maint-0.3.5'
From: nickm@xxxxxxxxxxxxxx
Date: Tue, 18 Dec 2018 18:34:16 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Tue, 18 Dec 2018 13:34: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 d3da077019740afae040e74fcaa033d0699f8a4b
Merge: cd14f9811 bf71dce01
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Tue Dec 18 13:34:01 2018 -0500

    Merge branch 'maint-0.3.5'
    
    "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] Note ticket number in changes file for 24803
Next by Author: [tor-commits] [tor/release-0.3.5] Merge branch 'maint-0.2.9' into maint-0.3.3
Previous by thread: [tor-commits] [tor/master] Merge branch 'maint-0.3.5'
Next by thread: [tor-commits] [tor/master] Merge branch 'maint-0.3.5'
Index(es):
- Author
- Thread