merge of '303a05a4ccfb4162f4cca475bca49d77dceb06f9'

     and '9c1c14d60b15e3d9eed4b291a7fae39c11d3c993'

debian/apparmor/i2p

@@ -11,7 +11,7 @@ network inet stream,
 network inet6 stream,
 
   # Needed by Java
-  owner @{PROC}                                           r,
+  @{PROC}                                                 r,
   owner @{PROC}/[0-9]*/                                   r,
   owner @{PROC}/[0-9]*/status                             r,
   /dev/random                                             r,

debian/apparmor/usr.bin.i2prouter

@@ -26,6 +26,7 @@
   /bin/sleep                            rix,
   /bin/uname                            rix,
   /bin/which                            rix,
+  /etc/default/i2p                      r,
 
   /usr/bin/{,g,m}awk                    rix,
   /usr/bin/cut                          rix,
@@ -48,3 +49,4 @@
   # Site-specific additions and overrides. See local/README for details.
   #include <local/usr.bin.i2prouter>
 }
+