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

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

To: tor-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [tor/master] Merge branch 'maint-0.3.2'
From: nickm@xxxxxxxxxxxxxx
Date: Thu, 21 Dec 2017 17:42:28 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Thu, 21 Dec 2017 12:42:52 -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 eb00840ab88f07820397e00cdc2a62b87a0f52cd
Merge: 7b9e79095 1a7779966
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Thu Dec 21 12:42:11 2017 -0500

    Merge branch 'maint-0.3.2'
    
    "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/maint-0.3.0] Fix a traceback when closing a blocked connection "immediately".
Next by Author: [tor-commits] [tor/release-0.3.2] Merge branch 'maint-0.3.2' into release-0.3.2
Previous by thread: [tor-commits] [tor/master] Merge branch 'maint-0.3.2'
Next by thread: [tor-commits] [tor/master] Merge branch 'maint-0.3.2'
Index(es):
- Author
- Thread