merges

3 files changed, 24 insertions, 0 deletions

diff --git a/README b/README
index 8fec5c83f..e90ccadb4 100644
--- a/README
+++ b/README
@@ -109,6 +109,8 @@ Cat (https://github.com/ecat3)
         - prevent tmux connecting to an existing session
 creideiki (https://github.com/creideiki)
         - make the sandbox process reap all children
+chiraag-nataraj (https://github.com/chiraag-nataraj)
+        - support for newer Xpra versions (2.1+)
 Christian Stadelmann (https://github.com/genodeftest)
         - profile fixes
         - evolution profile fix
@@ -491,6 +493,8 @@ vismir2 (https://github.com/vismir2)
         - claws-mail, mutt, git, emacs, vim profiles
         - lots of profile fixes
         -  support for truecrypt and zuluCrypt
+Vladimir Schowalter (https://github.com/VladimirSchowalter20)
+        - apparmor profile enhancements
 xee5ch (https://github.com/xee5ch)
         - skypeforlinux profile
 yumkam (https://github.com/yumkam)
diff --git a/README.md b/README.md
index 61279e14a..cd432f05b 100644
--- a/README.md
+++ b/README.md
@@ -114,6 +114,24 @@ Use this issue to request new profiles: [#1139](https://github.com/netblue30/fir
               fox
 `````
 
+## /etc/firejail/firejail.config
+
+`````
+# Number of ARP probes sent when assigning an IP address for --net option,
+# default 2. This is a partial implementation of RFC 5227. A 0.5 seconds
+# timeout is implemented for each probe. Increase this number to 4 if your
+# local layer 2 network uses RSTP (IEEE 802.1w). Permitted values are
+# between 1 and 30.
+# arp-probes 2
+
+# Enable this option if you have a version of Xpra that supports --attach switch
+# for start command, default disabled.
+# xpra-attach no
+
+
+`````
+
+
 ## Default seccomp list update
 
 The following syscalls have been added:
diff --git a/RELNOTES b/RELNOTES
index d1f28ac17..4c5b2555b 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -5,6 +5,8 @@ firejail (0.9.49) baseline; urgency=low
   * enhancement: /proc/sys mounting
   * enhancement: default seccomp list update
   * enhancement: rework IP address assingment for --net options
+  * enhancement: support for newer Xpra versions (2.1+) -
+     set "xpra-attach yes" in /etc/firejail/firejail.config
   * new profiles: curl, mplayer2, SMPlayer, Calibre, ebook-viewer, KWrite,
   * new profiles: Geary, Liferea, peek, silentarmy, IntelliJ IDEA,
   * new profiles: Android Studio, electron, riot-web, Extreme Tux Racer,