[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: Thu, 8 Nov 2018 14:02:13 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Thu, 08 Nov 2018 09:02:30 -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 4ef6e1d440c2788ba0beea266c7dc9bea3c010d4
Merge: 8e3bae566 6560346a4
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Thu Nov 8 09:01:08 2018 -0500

    Merge branch 'maint-0.3.5'
    
    "ours" 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/release-0.3.4] Merge branch 'maint-0.3.4' into release-0.3.4
Next by Author: [tor-commits] [tor/maint-0.3.5] Merge remote-tracking branch 'teor/bug28441-035' 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