tor

commit 97e1539f7f70898ac928f598bf711b7c317d29b7
parent 4df31adef7ada9221de7e39430a34234dd3fc6cb
Author: Nick Mathewson <nickm@torproject.org>
Date:   Tue, 19 Feb 2019 11:53:02 -0500

Merge remote-tracking branch 'tor-github/pr/706' into maint-0.4.0

Diffstat:
A
changes/ticket29072
 | 
2
++
D
contrib/or-tools/check-tor
 | 
41
-----------------------------------------

2 files changed, 2 insertions(+), 41 deletions(-)
diff --git a/changes/ticket29072 b/changes/ticket29072
@@ -0,0 +1,2 @@
+  o Removed features:
+    - Remove check-tor script from repository. Resolves issue 29072.
diff --git a/contrib/or-tools/check-tor b/contrib/or-tools/check-tor
@@ -1,41 +0,0 @@
-#!/bin/sh
-
-## Originally written by Peter Palfrader.
-
-## This script lets you quickly check if a given router (by nickname)
-## will let you do a TLS handshake, or will let you download a directory.
-
-## Usage: check-tor nickname
-
-#set -x
-
-router="$1"
-dirserver="http://belegost.seul.org:80/tor/"
-
-lines=$( wget -q $dirserver --proxy=off -O - | grep -A5 '^router '"$router"' ' )
-line=$( echo "$lines" | head -n1 )
-
-if [ -z "$line" ]; then
-	echo "Not found" >&2
-	exit 1
-fi
-
-echo "$lines"
-echo
-
-ipor=$( echo "$line" | awk '{printf "%s:%s", $3, $4}' )
-
-op=$( echo "$line" | awk '{printf $6}' )
-ipop=$( echo "$line" | awk '{printf "%s:%s", $3, $6}' )
-
-echo
-echo ">>" openssl s_client -connect "$ipor"
-timeout 5 openssl s_client -connect "$ipor" < /dev/null
-if [ "$op" != "0" ]; then
-	echo
-	echo ">>" wget --proxy=off -O - http://$ipop/tor/
-	timeout 5 wget --proxy=off -O - http://$ipop/tor/ | head -n3
-fi
-
-echo
-echo -n "$router "; echo "$lines" | grep 'fingerprint' | sed -e 's/^opt //' -e 's/^fingerprint //';