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

[tor-commits] [tor/maint-0.2.9] Merge branch 'maint-0.2.8' into maint-0.2.9

To: tor-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [tor/maint-0.2.9] Merge branch 'maint-0.2.8' into maint-0.2.9
From: nickm@xxxxxxxxxxxxxx
Date: Wed, 7 Dec 2016 23:29:03 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Wed, 07 Dec 2016 18:29:16 -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 f602172dbaa9b0db49d6de993c9e13a48d12079f
Merge: e7ade23 10baf2c
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Wed Dec 7 18:28:09 2016 -0500

    Merge branch 'maint-0.2.8' into maint-0.2.9
    
    (ours merge, to avoid taking 20865 fix)

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

Prev by Author: [tor-commits] [torspec/master] 271: decouple timeout from the rest of UPDATE_WAITING
Next by Author: [tor-commits] [tor/release-0.2.9] Merge branch 'getentropy_028' into maint-0.2.8
Previous by thread: [tor-commits] [tor/maint-0.2.9] Merge branch 'maint-0.2.8' into maint-0.2.9
Next by thread: [tor-commits] [tor/maint-0.2.9] Merge branch 'maint-0.2.8' into maint-0.2.9
Index(es):
- Author
- Thread