commit 929dd87c35a2f0e149f808805d1169047627e9af
Merge: 598c613 288b3ec
Author: Roger Dingledine <a...@torproject.org>
Date: Mon Sep 22 13:11:38 2014 -0400
Merge branch 'maint-0.2.4' into release-0.2.4
changes/bug13100 | 3 +
changes/bug13151-client | 13 +
changes/geoip-august2014 | 3 +
changes/geoip6-august2014 | 3 +
doc/tor.1.txt | 2 +-
src/config/geoip | 5217 +++++++++++++++++++++++++++++++++------------
src/config/geoip6 | 2012 ++++++-----------
src/or/config.c | 2 +-
src/or/rendclient.c | 2 +-
9 files changed, 4536 insertions(+), 2721 deletions(-)
_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
