summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2018-02-21 11:53:50 -0500
committerNick Mathewson <nickm@torproject.org>2018-02-21 11:53:50 -0500
commit8a5cb58ad0b8e553d9df24aca02b0f8af5c0d47c (patch)
treec6b5aef849d13518a1ed9a4244f825246cedfbf2
parent6384d314fb47a088299a14b52e5f60b6e79697b4 (diff)
parentbcfb034957dbd5d891befcd99a9725a225903b4e (diff)
downloadtor-8a5cb58ad0b8e553d9df24aca02b0f8af5c0d47c.tar.gz
tor-8a5cb58ad0b8e553d9df24aca02b0f8af5c0d47c.zip
Merge branch 'maint-0.3.2' into maint-0.3.3
-rw-r--r--.gitmodules2
-rw-r--r--changes/ticket253234
2 files changed, 5 insertions, 1 deletions
diff --git a/.gitmodules b/.gitmodules
index 7074403c9c..8f80405650 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
[submodule "src/ext/rust"]
path = src/ext/rust
- url = https://git.torproject.org/user/sebastian/tor-rust-dependencies
+ url = https://git.torproject.org/tor-rust-dependencies
diff --git a/changes/ticket25323 b/changes/ticket25323
new file mode 100644
index 0000000000..836825de5d
--- /dev/null
+++ b/changes/ticket25323
@@ -0,0 +1,4 @@
+ o Code simplification and refactoring:
+ - Update the "rust dependencies" submodule to be an project-level
+ repository, rather than a user repository. Closes ticket 25323.
+