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

[tor-commits] [tor/master] Merge branch 'maint-0.2.4' into maint-0.2.5

To: tor-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [tor/master] Merge branch 'maint-0.2.4' into maint-0.2.5
From: nickm@xxxxxxxxxxxxxx
Date: Mon, 5 Jun 2017 18:50:27 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Mon, 05 Jun 2017 15:41:08 -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 2e5220cb8b34b614fa10102899841247e906fb7b
Merge: 1a540b5 4ee48cb
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Mon Jun 5 14:38:54 2017 -0400

    Merge branch 'maint-0.2.4' into maint-0.2.5

 src/or/geoip.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)




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

Prev by Author: [tor-commits] [tor/maint-0.2.9] Reject Tor versions that contain non-numeric prefixes
Next by Author: [tor-commits] [tor/maint-0.2.8] Merge branch 'maint-0.2.5' into maint-0.2.6
Previous by thread: [tor-commits] [tor/master] Merge branch 'maint-0.2.4' into maint-0.2.5
Next by thread: [tor-commits] [tor/master] Merge branch 'maint-0.2.4' into maint-0.2.5
Index(es):
- Author
- Thread