Skip to content

Commit

Permalink
Marionette Updates
Browse files Browse the repository at this point in the history
  • Loading branch information
John Helmsen authored and John Helmsen committed Sep 11, 2018
1 parent b42f4f8 commit b239ea1
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 14 deletions.
18 changes: 6 additions & 12 deletions LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -175,18 +175,12 @@

END OF TERMS AND CONDITIONS

APPENDIX: How to apply the Apache License to your work.

To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "{}"
replaced with your own identifying information. (Don't include
the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a
file or class name and description of purpose be included on the
same "printed page" as the copyright notice for easier
identification within third-party archives.

Copyright {yyyy} {name of copyright owner}
Copyright 2013-2018 Redjack, LLC

For more information, please contact:

[email protected] +1 301-273-4372 or
[email protected]

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
marionette
==========

This is a Go port of the [marionette][] programmable networy proxy.
This is a Go port of the [marionette][] programmable protocol obfuscation tool..

[marionette]: https://github.com/marionette-tg/marionette

Expand All @@ -11,4 +11,4 @@ This is a Go port of the [marionette][] programmable networy proxy.
- [User Guide](doc/USER_GUIDE.md)
- [Design Document](doc/DESIGN.md)
- [Developer Manual](doc/DEVELOPER_MANUAL.md)
- [Protocol Design](doc/Protocol.md)
- [Protocol Design](doc/PROTOCOL.md)

0 comments on commit b239ea1

Please sign in to comment.