Commits
Travis Cross committed 7e193ed3827
Revert "disable these options if zrtp isn't enabled" Brian and I talked about this and concurred on the reversion here. Part of the point of the ZRTP pass-through mode code is that it allows two legs to have a ZRTP-enabled call even if FS doesn't have ZRTP. This reverts commit f0aa4ab390b1f905ec1d99f689bfec6215308dcd.