diff options
author | Peter Palfrader <peter@palfrader.org> | 2008-06-11 11:12:40 +0000 |
---|---|---|
committer | Peter Palfrader <peter@palfrader.org> | 2008-06-11 11:12:40 +0000 |
commit | b2fcc417d4e515059018f282149f95df9bd6caab (patch) | |
tree | 9da5b61bd6931af8c54d8ac68f4290f208dc38cb /debian/patches/00list | |
parent | 62b507fee0913b61c5428bebb52cb9123d0b76ac (diff) | |
download | tor-b2fcc417d4e515059018f282149f95df9bd6caab.tar.gz tor-b2fcc417d4e515059018f282149f95df9bd6caab.zip |
Merge 0.1.2.x branch changes since 0.1.2.27-rc-1 into trunk. I wonder when we will stop developing in two branches at the same time
svn:r15131
Diffstat (limited to 'debian/patches/00list')
-rw-r--r-- | debian/patches/00list | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/debian/patches/00list b/debian/patches/00list index a6d4270cc8..9260bb7ed5 100644 --- a/debian/patches/00list +++ b/debian/patches/00list @@ -2,4 +2,4 @@ 03_tor_manpage_in_section_8.dpatch 06_add_compile_time_defaults.dpatch 07_log_to_file_by_default.dpatch -11_tor_as_root_more_helpful.dpatch +14_fix_geoip_warning |