Merge remote-tracking branch 'upstream/master'

MobileLibrary/iOS/PsiphonTunnelController/PsiphonTunnelController/PsiphonTunnelController.h

@@ -50,3 +50,7 @@ FOUNDATION_EXPORT const unsigned char PsiphonMobileVersionString[];
 -(void) stopTunnel;
 
 @end
+
+@interface Psi : NSObject
++ (void)sendFeedback:(NSString*)configJson diagnostics: (NSString*)diagnosticsJson b64EncodedPublicKey: (NSString*) b64EncodedPublicKey uploadServer: (NSString*)uploadServer uploadPath: (NSString*) uploadPath uploadServerHeaders: (NSString*)uploadServerHeaders;
+@end

MobileLibrary/iOS/PsiphonTunnelController/PsiphonTunnelController/PsiphonTunnelController.m

@@ -148,3 +148,8 @@
 
 @end
 
+@implementation Psi
++ (void)sendFeedback:(NSString*)configJson diagnostics: (NSString*)diagnosticsJson b64EncodedPublicKey: (NSString*) b64EncodedPublicKey uploadServer: (NSString*)uploadServer uploadPath: (NSString*) uploadPath uploadServerHeaders: (NSString*)uploadServerHeaders {
+    GoPsiSendFeedback(configJson, diagnosticsJson, b64EncodedPublicKey, uploadServer, uploadPath, uploadServerHeaders);
+}
+@end