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

[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.6'

To: tor-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.6'
From: nickm@xxxxxxxxxxxxxx
Date: Sun, 12 Jul 2015 20:38:18 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Sun, 12 Jul 2015 16:38:29 -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 eb4604c35a97a27d2a16786c81a5499c46914dad
Merge: 062497f 9d1801b
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Sun Jul 12 16:37:59 2015 -0400

    Merge remote-tracking branch 'origin/maint-0.2.6'
    
    This is an 'ours' merge, to avoid taking the bump to 0.2.6.10-dev

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

Prev by Author: [tor-commits] [tor/master] Bump maint-0.2.6 to 0.2.6.10-dev
Next by Author: [tor-commits] [tor/master] Tell coverity to tolerate ed25519_verify
Previous by thread: [tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.6'
Next by thread: [tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.6'
Index(es):
- Author
- Thread