Merge branch 'restricted_routes' into meshnet

This commit is contained in:
Jeff Becker 2016-06-28 13:28:57 -04:00
commit 50756eb94a
No known key found for this signature in database
GPG key ID: AB950234D6EA286B
18 changed files with 269 additions and 103 deletions

2
SSU.h
View file

@ -63,7 +63,7 @@ namespace transport
std::shared_ptr<SSUSession> GetPeerTestSession (uint32_t nonce);
void UpdatePeerTest (uint32_t nonce, PeerTestParticipant role);
void RemovePeerTest (uint32_t nonce);
private:
void Run ();