Merge remote branch 'origin/maint-0.2.2'

Conflicts: src/or/config.c src/or/cpuworker.c
2024-12-06 19:41:15 +01:00 · 2010-11-15 14:14:13 -05:00
parent 3d7772ece3 ac2c0cb587
commit 8c2affe637
14 changed files with 111 additions and 635 deletions
@@ -0,0 +1,4 @@
+  o Code simplifications and refactoring:
+    - Some options used different conventions for uppercasing of acronyms
+      when comparing manpage and source. Fix those in favor of the
+      manpage, as it makes sense to capitalize acronyms.
@@ -0,0 +1,3 @@
+  o Minor features:
+    - Make hidden services work better in private networks by not requiring
+      any uptime to join the dht. Implements ticket 2088.
@@ -0,0 +1,4 @@
+  o Code simplifications and refactorings:
+    - Remove the torrc.complete file. It hasn't been kept up to date
+      and users will have better luck checking out the manpage.
+