[prev in list] [next in list] [prev in thread] [next in thread]
List: tor-cvs
Subject: [tor-commits] [tor/release-0.2.2] Merge branch 'maint-0.2.2' into release-0.2.2
From: arma () torproject ! org
Date: 2012-02-29 18:25:45
Message-ID: 20120229182545.10C202956C () cupani ! torproject ! org
[Download RAW message or body]
commit 30d0319684afcf337f7fccbc695a84279c9d7d0a
Merge: 121ae29 e217569
Author: Roger Dingledine <arma@torproject.org>
Date: Wed Feb 29 13:25:13 2012 -0500
Merge branch 'maint-0.2.2' into release-0.2.2
changes/bug5065 | 5 +
changes/bug5067 | 5 +
changes/geoip-february2012 | 3 +
changes/maatuska-ip | 3 +
src/common/Makefile.am | 4 +-
src/common/tortls.c | 6 +-
src/config/geoip |12782 +++++++++++++++++++++++++-------------------
src/or/Makefile.am | 4 +-
src/or/config.c | 2 +-
src/or/routerlist.c | 6 +-
10 files changed, 7217 insertions(+), 5603 deletions(-)
_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic