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

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

To: tor-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [tor/master] Merge branch 'maint-0.3.3'
From: nickm@xxxxxxxxxxxxxx
Date: Tue, 22 May 2018 16:34:01 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Tue, 22 May 2018 12:42:11 -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 1afdb5b6cc1d07d49d5c8f369e1493dd844acad9
Merge: add00045a 569b4e57e
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Tue May 22 12:33:09 2018 -0400

    Merge branch 'maint-0.3.3'
    
    "Ours" merge to avoid the maint-0.3.3 version of the TROVE-2018-005
    fix, which touches the files in their old locations.




_______________________________________________
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.1] Merge branch 'maint-0.2.9' into maint-0.3.1
Next by Author: [tor-commits] [tor/master] Add a missing include to get the declaration of OPENSSL_1_1_API
Previous by thread: [tor-commits] [tor/master] Merge branch 'maint-0.3.3'
Next by thread: [tor-commits] [tor/master] Merge branch 'maint-0.3.3'
Index(es):
- Author
- Thread