Fix everything that previously referred to src/or

3 files changed, 4 insertions, 6 deletions

diff --git a/src/test/test-network.sh b/src/test/test-network.sh
index 6e0f286573..b7a9f1b3c0 100755
--- a/src/test/test-network.sh
+++ b/src/test/test-network.sh
@@ -52,12 +52,12 @@ done
 #  - if $PWD looks like a tor build directory, set it to $PWD, or
 #  - unset $TOR_DIR, and let chutney fall back to finding tor binaries in $PATH
 if [ ! -d "$TOR_DIR" ]; then
-    if [ -d "$BUILDDIR/src/or" -a -d "$BUILDDIR/src/tools" ]; then
+    if [ -d "$BUILDDIR/src/core/or" -a -d "$BUILDDIR/src/tools" ]; then
         # Choose the build directory
         # But only if it looks like one
         $ECHO "$myname: \$TOR_DIR not set, trying \$BUILDDIR"
         TOR_DIR="$BUILDDIR"
-    elif [ -d "$PWD/src/or" -a -d "$PWD/src/tools" ]; then
+    elif [ -d "$PWD/src/core/or" -a -d "$PWD/src/tools" ]; then
         # Guess the tor directory is the current directory
         # But only if it looks like one
         $ECHO "$myname: \$TOR_DIR not set, trying \$PWD"
diff --git a/src/test/test_bridges.c b/src/test/test_bridges.c
index bdab148901..07d6b88ed9 100644
--- a/src/test/test_bridges.c
+++ b/src/test/test_bridges.c
@@ -3,7 +3,7 @@
 
 /**
  * \file test_bridges.c
- * \brief Unittests for code in src/or/bridges.c
+ * \brief Unittests for code in bridges.c
  **/
 
 #define TOR_BRIDGES_PRIVATE
@@ -609,4 +609,3 @@ struct testcase_t bridges_tests[] = {
   B_TEST(transport_is_needed, 0),
   END_OF_TESTCASES
 };
-
diff --git a/src/test/test_router.c b/src/test/test_router.c
index a398c7497b..c6a2452c8c 100644
--- a/src/test/test_router.c
+++ b/src/test/test_router.c
@@ -4,7 +4,7 @@
 
 /**
  * \file test_router.c
- * \brief Unittests for code in src/or/router.c
+ * \brief Unittests for code in router.c
  **/
 
 #include "core/or/or.h"
@@ -111,4 +111,3 @@ struct testcase_t router_tests[] = {
   ROUTER_TEST(dump_router_to_string_no_bridge_distribution_method, TT_FORK),
   END_OF_TESTCASES
 };
-