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

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

To: tor-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [tor/master] Merge branch 'maint-0.3.1'
From: nickm@xxxxxxxxxxxxxx
Date: Tue, 5 Sep 2017 14:21:20 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Tue, 05 Sep 2017 10:21:39 -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 ccb671dc1cf8171a4f0df5940ba71b8cf89c04d3
Merge: 841f48ac4 fd0a894d2
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Tue Sep 5 10:21:05 2017 -0400

    Merge branch 'maint-0.3.1'
    
    "ours" merge 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] remove a redundant changes file for 22750
Next by Author: [tor-commits] [tor/master] Use setup_full_capture_of_logs for 21800
Previous by thread: [tor-commits] [tor/master] Merge branch 'maint-0.3.1'
Next by thread: [tor-commits] [tor/master] Merge branch 'maint-0.3.1'
Index(es):
- Author
- Thread