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

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

To: tor-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [tor/master] Merge branch 'maint-0.3.5'
From: nickm@xxxxxxxxxxxxxx
Date: Fri, 16 Nov 2018 16:32:59 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Fri, 16 Nov 2018 11:33: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 f42c3cfe2e3568bea0d521c972e252ba2dcf4188
Merge: 5065a6850 942c2da48
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Fri Nov 16 11:32:10 2018 -0500

    Merge branch 'maint-0.3.5'
    
    "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/release-0.3.5] hs-v3: Close client intro circuits if the descriptor is replaced
Next by Author: [tor-commits] [tor/release-0.3.5] Merge branch 'bug27963_wallclock' into maint-0.3.5
Previous by thread: [tor-commits] [tor/master] Merge branch 'maint-0.3.5'
Next by thread: [tor-commits] [tor/master] Merge branch 'maint-0.3.5'
Index(es):
- Author
- Thread