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

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

To: tor-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [tor/master] Merge branch 'maint-0.2.9' into maint-0.3.1
From: nickm@xxxxxxxxxxxxxx
Date: Sat, 3 Mar 2018 16:34:17 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Sat, 03 Mar 2018 14:00:32 -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 2e2aacca2aa635a840c57e87e3769403505a19d2
Merge: c527a8a9c 9eb6f9d3c
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Sat Mar 3 11:32:29 2018 -0500

    Merge branch 'maint-0.2.9' into maint-0.3.1
    
    "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/maint-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
Next by Author: [tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3
Previous by thread: [tor-commits] [tor/master] Merge branch 'maint-0.2.9' into maint-0.3.1
Next by thread: [tor-commits] [tor/master] Merge branch 'maint-0.2.9' into maint-0.3.1
Index(es):
- Author
- Thread