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

[tor-commits] [tor/release-0.2.8] Merge branch 'maint-0.2.5' into maint-0.2.8

To: tor-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [tor/release-0.2.8] Merge branch 'maint-0.2.5' into maint-0.2.8
From: nickm@xxxxxxxxxxxxxx
Date: Fri, 1 Dec 2017 14:35:56 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Fri, 01 Dec 2017 10:46:27 -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 dc3890439f156d4c79b153f13f7ecf3393362b29
Merge: 8f858de81 162a087e5
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Fri Dec 1 09:34:47 2017 -0500

    Merge branch 'maint-0.2.5' into maint-0.2.8
    
    "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/release-0.3.1] Merge remote-tracking branch 'asn/bug23862_030' into maint-0.3.0
Next by Author: [tor-commits] [tor/master] control: Support HS v3 for CIRC and CIRC_MINOR event
Previous by thread: [tor-commits] [tor/release-0.2.8] Merge branch 'maint-0.2.5' into maint-0.2.8
Next by thread: [tor-commits] [tor/release-0.2.8] Merge branch 'maint-0.2.5' into maint-0.2.8
Index(es):
- Author
- Thread