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

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

To: tor-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [tor/master] Merge branch 'maint-0.3.0'
From: nickm@xxxxxxxxxxxxxx
Date: Wed, 5 Apr 2017 14:05:32 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Wed, 05 Apr 2017 10:05:55 -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 0e5e5ba64bab49d056814bc933ab3c4c0a0f5a74
Merge: 868de69 06fe8a1
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Wed Apr 5 10:04:42 2017 -0400

    Merge branch 'maint-0.3.0'
    
    "ours" merge to avoid the 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] Approximate memory usage needed for the Zstandard backend.
Next by Author: [tor-commits] [tor/master] Increase MALLOC_MP_LIM to 16MB
Previous by thread: [tor-commits] [tor/master] Merge branch 'maint-0.3.0'
Next by thread: [tor-commits] [tor/master] Merge branch 'maint-0.3.0'
Index(es):
- Author
- Thread