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
commitbcfb034957dbd5d891befcd99a9725a225903b4e (patch)
treed24a37dee83a2021554d67c23bafba4c6e6df1fe
parentbd71e0a0c8ccf684c40201f08c456596eac60887 (diff)
parentac1942ac58d631af036acc97c73dad9d89b23aaf (diff)
downloadtor-bcfb034957dbd5d891befcd99a9725a225903b4e.tar.gz
tor-bcfb034957dbd5d891befcd99a9725a225903b4e.zip
Merge branch 'maint-0.3.1' into maint-0.3.2
-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.
+