[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.3

To: tor-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [tor/master] Merge branch 'maint-0.2.9' into maint-0.3.3
From: nickm@xxxxxxxxxxxxxx
Date: Wed, 23 Jan 2019 14:51:37 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Wed, 23 Jan 2019 09:52:17 -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 d1c0dbabfaa2d26839af55c834677b667479b369
Merge: 4cca7fb99 dd6c2b0ad
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Wed Jan 23 09:50:38 2019 -0500

    Merge branch 'maint-0.2.9' into maint-0.3.3
    
    "ours" merge to avoid dropping non-broken changes files after
    removal of merged 0.2.9 changes files.




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

Prev by Author: [tor-commits] [webwml/master] Stable is 0.3.5.7; there is no alpha for the moment.
Next by Author: [tor-commits] [tor/master] Remove a needless memset() in get_token_arguments()
Previous by thread: [tor-commits] [tor/master] Merge branch 'maint-0.2.9' into maint-0.3.3
Next by thread: [tor-commits] [tor/release-0.2.9] Bug 21394 touchup: Increase DNS attempts to 3
Index(es):
- Author
- Thread