[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 13:04:49 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Tue, 18 Dec 2018 08:05:07 -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 a5c9ae8526f179e588dc9de73a5c89ffaca70ad8
Merge: 5a22b42c3 d8f41c287
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Tue Dec 18 08:04:23 2018 -0500

    Merge branch 'maint-0.3.5'
    
    Use "git merge -s ours" to avoid a 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] Make Windows process event timer API available for dormant interface.
Next by Author: [tor-commits] [tor/release-0.3.5] Merge branch 'maint-0.3.4' into maint-0.3.5
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