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

[tor-commits] [tor/release-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2

To: tor-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [tor/release-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
From: nickm@xxxxxxxxxxxxxx
Date: Fri, 1 Dec 2017 13:54:57 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Fri, 01 Dec 2017 09:06:31 -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 9c89e8e4354283e4596e82adb876653d4c95ac6c
Merge: fd73a168c 4ebd43654
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Thu Nov 30 12:25:53 2017 -0500

    Merge branch 'maint-0.3.1' into maint-0.3.2
    
    "ours" to avoid version bumps




_______________________________________________
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.2] Merge branch 'arthuredelstein_18859+1_031' into maint-0.3.2
Next by Author: [tor-commits] [tor/release-0.3.1] Merge branch 'maint-0.3.1' into release-0.3.1
Previous by thread: [tor-commits] [tor/release-0.3.1] Merge branch 'maint-0.2.9' into maint-0.3.0
Next by thread: [tor-commits] [tor/release-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
Index(es):
- Author
- Thread