[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: Tue, 28 Feb 2017 15:42:30 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Tue, 28 Feb 2017 10:55:36 -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 9ec08f98995a87baf6c0367a036661286f58e295
Merge: 1453bda 58908b6
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Tue Feb 28 10:40:34 2017 -0500

    Merge branch 'maint-0.3.0'
    
    This is an "ours" merge to avoid a 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.2.6] Change behavior on missing/present event to warn instead of asserting.
Next by Author: [tor-commits] [tor/master] Log response size in connection_dir_client_reached_eof()
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