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

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

To: tor-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [tor/master] Merge branch 'maint-0.3.4'
From: nickm@xxxxxxxxxxxxxx
Date: Mon, 6 Aug 2018 12:29:57 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Mon, 06 Aug 2018 08:30: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 c165cb7f57c6af842c5f1c117a99da8b5a3d50d7
Merge: f90c05337 a8bab72c3
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Mon Aug 6 08:29:44 2018 -0400

    Merge branch 'maint-0.3.4'
    
    "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/master] Appveyor CI: always use HEAD for the short commit
Next by Author: [tor-commits] [tor/release-0.3.3] Merge remote-tracking branch 'public/bug26779_033' into maint-0.3.3
Previous by thread: [tor-commits] [tor/master] Merge branch 'maint-0.3.4'
Next by thread: [tor-commits] [tor/master] Merge branch 'maint-0.3.4'
Index(es):
- Author
- Thread