commit b670a079236a4e382cfe927f3e352b3e7a231166
Author: Yawning Angel <[email protected]>
Date: Thu Mar 26 06:46:24 2015 +0000
Fix comments. (No functional changes)
---
obfs4proxy/parentMonitor.go | 2 +-
obfs4proxy/parentMonitor_linux.go | 7 +++----
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/obfs4proxy/parentMonitor.go b/obfs4proxy/parentMonitor.go
index beeea50..e2f078d 100644
--- a/obfs4proxy/parentMonitor.go
+++ b/obfs4proxy/parentMonitor.go
@@ -63,7 +63,7 @@ func parentMonitorPpidChange(ppid int) {
// exceptions (Slowlaris/Android), but the parent PID changes
// under those platforms as well.
//
- // Naturally we lose if the parent has died by the when the
+ // Naturally we lose if the parent has died by the time when the
// Getppid() call was issued in our parent, but, this is better
// than nothing.
diff --git a/obfs4proxy/parentMonitor_linux.go
b/obfs4proxy/parentMonitor_linux.go
index 0fc967f..65fd307 100644
--- a/obfs4proxy/parentMonitor_linux.go
+++ b/obfs4proxy/parentMonitor_linux.go
@@ -33,10 +33,9 @@ import (
)
func parentMonitorInitLinux() error {
- /* Use prctl() to have the kernel deliver a SIGTERM if the parent
- * process dies. This beats anything else that can be done before
- * #15435 is implemented.
- */
+ // Use prctl() to have the kernel deliver a SIGTERM if the parent
+ // process dies. This beats anything else that can be done before
+ // #15435 is implemented.
_, _, errno := syscall.Syscall(syscall.SYS_PRCTL,
syscall.PR_SET_PDEATHSIG, uintptr(syscall.SIGTERM), 0)
if errno != 0 {
var err error = errno
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
