disapproval of revision '2fccba5dbe1b538679f15727fd95295842ed8839'
merge of '3adba0cec6f0291ae90747ab22535290e64e6606'
     and 'fd10b04ca3a6cf66e669bfad32d3011ed9f7e33c'
 * i2ptunnel: Default to 3 hops (ticket #936)
 * Console: Remove I2PDigestAuthenticator workaround, as Jetty 7.6.11 has the fix
 * Jetty 7.6.11
 * Tomcat 6.0.37