Add Proxy Type Option
Add Proxy Type Option
Add Proxy Type Option
Add Proxy Type Option

Allow UPD protocol with socks proxy
squid3-dev - remove obsolete ignore_expect_100 option and include info on gui for owa ssl offload
Merge pull request #455 from bmeeks8/master

Snort Pkg 2.5.8 Fix for User-Reported Bug and a few minor updates
Fixed incorrect limit on number of processes of smtpd in generated master.conf
Merge pull request #457 from petr-tichy/master

Fixed incorrect limit on number of processes of smtpd in generated master.conf
Fixed edit report logs bug in status_mail_report_edit.php

status_mail_report_edit.php had an incorrect entry for editing the log report. This is a small changed that simply replaces status_mail_report_add_cmd.php with status_mail_report_add_log.php where appropriate.
Merge pull request #458 from deelowe/master

Fixed small bug in status_mail_report_edit.php
Merge pull request #456 from N0YB/master

Add Proxy Type Option
Bump the haproxy binaries up to 1.4.23
Fixup squid/sqidGuard build options now that the squid port has OPTIONSNG
Add LDAP search patch from http://forum.pfsense.org/index.php/topic,59246.0.html
Bump pkg version for squidGuard.
Fix NRPEv2 build flags (they were backwards for SET/UNSET)
Add another carp status check to quagga package.
add a couple of newlines here for spacing.
Escape this $ here.
And fix this bracketing