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

[tor-commits] [tor/release-0.3.1] Merge branch 'maint-0.3.0' into maint-0.3.1

To: tor-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [tor/release-0.3.1] Merge branch 'maint-0.3.0' into maint-0.3.1
From: nickm@xxxxxxxxxxxxxx
Date: Thu, 14 Sep 2017 17:22:26 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Thu, 14 Sep 2017 14:01:24 -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 2446d4acc506842963a2b4d52ddcea95b5f6cccf
Merge: 471e0096a e46849846
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Thu Sep 14 13:22:04 2017 -0400

    Merge branch 'maint-0.3.0' into maint-0.3.1
    
    "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/master] Extract the important parts of the run-pending-timers function.
Next by Author: [tor-commits] [tor/master] sched: revisist compatibility on non-linux systems
Previous by thread: [tor-commits] [tor/release-0.3.1] Merge branch 'maint-0.3.0' into maint-0.3.1
Next by thread: [tor-commits] [tor/release-0.3.1] Merge branch 'maint-0.3.0' into maint-0.3.1
Index(es):
- Author
- Thread