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

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

To: tor-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [tor/master] Merge branch 'maint-0.3.1' into maint-0.3.2
From: nickm@xxxxxxxxxxxxxx
Date: Sat, 18 Nov 2017 16:03:23 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Sat, 18 Nov 2017 11:21:15 -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 65a6103afc39890f41f6f5e7ba7e4ef570af1622
Merge: d45bf0c65 735855952
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Sat Nov 18 11:02:58 2017 -0500

    Merge branch 'maint-0.3.1' into maint-0.3.2
    
    "Ours" merge to avoid taking ticket18329_minimal_025




_______________________________________________
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 'bug23291_028' into maint-0.2.8
Next by Author: [tor-commits] [tor/maint-0.3.1] Merge branch 'bug22895_027' into maint-0.2.9
Previous by thread: [tor-commits] [tor/master] Merge branch 'maint-0.3.1' into maint-0.3.2
Next by thread: [tor-commits] [tor/master] Merge branch 'maint-0.3.1' into maint-0.3.2
Index(es):
- Author
- Thread