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

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

To: tor-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [tor/master] Merge branch 'maint-0.3.1'
From: nickm@xxxxxxxxxxxxxx
Date: Fri, 19 Jan 2018 15:19:06 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Fri, 19 Jan 2018 10:28:37 -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 9652c65fa3b9b3346d346daea05c8b3c22b3e125
Merge: 2c9e0a286 483a59ec2
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Fri Jan 19 10:18:35 2018 -0500

    Merge branch 'maint-0.3.1'
    
    "ours" merge to avoid the 0.3.1 version of the 24863 fix.




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

Prev by Author: [tor-commits] [tor/master] geoip: Add a lookup function for client map entry
Next by Author: [tor-commits] [tor/maint-0.3.2] Clarify the OutboundBindAddressOR documentation in the sample torrc
Previous by thread: [tor-commits] [tor/maint-0.3.1] Merge remote-tracking branch 'tlyu-github/travis-workaround-031' into maint-0.3.1
Next by thread: [tor-commits] [tor/release-0.3.2] Merge remote-tracking branch 'tlyu-github/travis-workaround-031' into maint-0.3.1
Index(es):
- Author
- Thread