diff options
author | Seth Mos <seth.mos@dds.nl> | 2011-01-18 09:10:36 +0100 |
---|---|---|
committer | Seth Mos <seth.mos@dds.nl> | 2011-01-18 09:10:36 +0100 |
commit | 1f74cd2d101f032472a4968a10b64161652d6c1f (patch) | |
tree | d692513243aaed6003264f0b877b50cbeb69328b /etc/bogons | |
parent | c9d174dfc0a29c59ae35f43a470460f36f695b61 (diff) | |
parent | 96e889fc1e938187dd18238d80e3163e1aca3006 (diff) | |
download | pfsense-1f74cd2d101f032472a4968a10b64161652d6c1f.zip pfsense-1f74cd2d101f032472a4968a10b64161652d6c1f.tar.gz |
Merge remote branch 'upstream/master'
Conflicts:
etc/inc/interfaces.inc
etc/inc/system.inc
Diffstat (limited to 'etc/bogons')
-rw-r--r-- | etc/bogons | 21 |
1 files changed, 5 insertions, 16 deletions
@@ -1,28 +1,17 @@ 0.0.0.0/8 -5.0.0.0/8 -14.0.0.0/8 -23.0.0.0/8 -31.0.0.0/8 -36.0.0.0/8 -37.0.0.0/8 39.0.0.0/8 -42.0.0.0/8 -49.0.0.0/8 -100.0.0.0/8 -101.0.0.0/8 102.0.0.0/8 103.0.0.0/8 104.0.0.0/8 -105.0.0.0/8 106.0.0.0/8 127.0.0.0/8 169.254.0.0/16 -176.0.0.0/8 -177.0.0.0/8 179.0.0.0/8 -181.0.0.0/8 185.0.0.0/8 +192.0.0.0/24 192.0.2.0/24 198.18.0.0/15 -223.0.0.0/8 -224.0.0.0/3
\ No newline at end of file +198.51.100.0/24 +203.0.113.0/24 +224.0.0.0/4 +240.0.0.0/4
\ No newline at end of file |