Merge branch 'ssh-channel-with-statement'
Merge branch 'ssh-easy-bad-attrs'
Merge branch 'less-silent-ssh'
Merge branch 'elf-disasm-vma'
Merge branch 'v2-rop'
Merge branch 'v2-rop'
Merge branch 'v2-rop'
Merge branch 'elf-dso-address-fix'

Conflicts:
	pwnlib/elf.py
Merge branch 'ssh-channel-with-statement'
Merge branch 'gdb-resolve-library-addresses'
Merge branch 'freebsd-ssh-cache'
Make ELF repr meaningful for working in REPL
Merge branch 'v2-rop'
Merge branch 'elf-repr'

Conflicts:
	pwnlib/elf.py
Merge branch 'ssh-easy-bad-attrs'
Merge branch 'elf-dont-load-dyn-dependencies'
Merge branch 'gdb-resolve-library-addresses'
Merge remote-tracking branch 'upstream/master'

Conflicts:
	pwnlib/elf.py
Merge branch 'rop-easy'
Merge remote-tracking branch 'upstream/master'