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

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

To: tor-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.3.1' into maint-0.3.2
From: nickm@xxxxxxxxxxxxxx
Date: Tue, 27 Mar 2018 22:26:46 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Tue, 27 Mar 2018 19:05:04 -0400
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 5e7d505850607a16f6051a19ff60c39ff4c8393e
Merge: b5a6c0399 5acfc3087
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Tue Mar 27 18:24:37 2018 -0400

    Merge branch 'maint-0.3.1' into maint-0.3.2
    
    "ours" merge to avoid earlier version of 25629 fix.




_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

Prev by Author: [tor-commits] [tor/master] changes: Add changes file for bug25479.
Next by Author: [tor-commits] [tor/master] fixups from code review
Previous by thread: [tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.3.1' into maint-0.3.2
Next by thread: [tor-commits] [tor/master] increment to 0.3.3.3-alpha
Index(es):
- Author
- Thread