Merge branch 'master' of https://framagit.org/simgrid/simgrid

diff --combined MANIFEST.in
index b58b894,92dcb69..75b0723
--- 1/MANIFEST.in
--- 2/MANIFEST.in
+++ b/MANIFEST.in
@@@ -557,6 -557,7 +557,7 @@@ include teshsuite/mc/mutex-handling/mut
  include teshsuite/mc/mutex-handling/mutex-handling.tesh
  include teshsuite/mc/mutex-handling/mutex-handling_d.xml
  include teshsuite/mc/mutex-handling/without-mutex-handling.tesh
+ include teshsuite/mc/random-bug/random-bug-nocrash.tesh
  include teshsuite/mc/random-bug/random-bug-replay.tesh
  include teshsuite/mc/random-bug/random-bug.cpp
  include teshsuite/mc/random-bug/random-bug.tesh
@@@ -1896,7 -1897,6 +1897,7 @@@ include include/simgrid/Exception.hp
  include include/simgrid/actor.h
  include include/simgrid/barrier.h
  include include/simgrid/chrono.hpp
 +include include/simgrid/cond.h
  include include/simgrid/config.h.in
  include include/simgrid/engine.h
  include include/simgrid/forward.h
@@@ -1926,7 -1926,6 +1927,7 @@@ include include/simgrid/link.
  include include/simgrid/mailbox.h
  include include/simgrid/modelchecker.h
  include include/simgrid/msg.h
 +include include/simgrid/mutex.h
  include include/simgrid/plugins/dvfs.h
  include include/simgrid/plugins/energy.h
  include include/simgrid/plugins/file_system.h