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

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

To: tor-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [tor/master] Merge branch 'maint-0.3.2' into maint-0.3.3
From: nickm@xxxxxxxxxxxxxx
Date: Sat, 3 Mar 2018 16:34:17 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Sat, 03 Mar 2018 11:40:41 -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 35d945a646b3384640d3863aec07d873179efffd
Merge: 15f6201a5 0026d1a67
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Sat Mar 3 11:33:33 2018 -0500

    Merge branch 'maint-0.3.2' into maint-0.3.3
    
    "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 branch 'maint-0.2.9' into maint-0.3.1
Next by Author: [tor-commits] [tor/release-0.3.3] tests: Fix crash on win32 due to uninitialised mutex in bench.c.
Previous by thread: [tor-commits] [tor/master] Merge branch 'maint-0.3.2' into maint-0.3.3
Next by thread: [tor-commits] [tor/master] Merge branch 'maint-0.3.2' into maint-0.3.3
Index(es):
- Author
- Thread