diff options
| author | Nick Mathewson <nickm@torproject.org> | 2010-11-15 14:14:13 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2010-11-15 14:14:13 -0500 |
| commit | 8c2affe637e0cfbf5ddfe02c910c75bcd749ded3 (patch) | |
| tree | 84c6140c4b32bbd7ef4b226c59329c8345ccde24 /changes | |
| parent | 3d7772ece3128097f4d541585e525c61f6ea27c2 (diff) | |
| parent | ac2c0cb587548c4faf3fa225064cdbd183f609bb (diff) | |
| download | tor-8c2affe637e0cfbf5ddfe02c910c75bcd749ded3.tar.gz tor-8c2affe637e0cfbf5ddfe02c910c75bcd749ded3.zip | |
Merge remote branch 'origin/maint-0.2.2'
Conflicts:
src/or/config.c
src/or/cpuworker.c
Diffstat (limited to 'changes')
| -rw-r--r-- | changes/HTTP | 4 | ||||
| -rw-r--r-- | changes/minuptimehs | 3 | ||||
| -rw-r--r-- | changes/torrc.complete | 4 |
3 files changed, 11 insertions, 0 deletions
diff --git a/changes/HTTP b/changes/HTTP new file mode 100644 index 0000000000..078d9b3bca --- /dev/null +++ b/changes/HTTP @@ -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. diff --git a/changes/minuptimehs b/changes/minuptimehs new file mode 100644 index 0000000000..d7474d21f5 --- /dev/null +++ b/changes/minuptimehs @@ -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. diff --git a/changes/torrc.complete b/changes/torrc.complete new file mode 100644 index 0000000000..03d51c1213 --- /dev/null +++ b/changes/torrc.complete @@ -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. + |