diff options
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/HACKING | 6 | ||||
| -rw-r--r-- | doc/tor.1.txt | 9 |
2 files changed, 6 insertions, 9 deletions
diff --git a/doc/HACKING b/doc/HACKING index 2156f7ca1..c69b2a6fe 100644 --- a/doc/HACKING +++ b/doc/HACKING @@ -537,3 +537,9 @@ changelog to tor-talk or tor-announce. (We might be moving to faster announcements, but don't announce until the website is at least updated.) +13) If it's a stable release, bump the version number in the maint-x.y.z + branch to "newversion-dev", and do a "merge -s ours" merge to avoid + taking that change into master. Do a similar 'merge -s theirs' + merge to get the change (and only that change) into release. (Some + of the build scripts require that maint merge cleanly into release.) + diff --git a/doc/tor.1.txt b/doc/tor.1.txt index ac8ccfb07..2f97ecdb3 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -593,15 +593,6 @@ GENERAL OPTIONS This is useful when running on flash memory or other media that support only a limited number of writes. (Default: 0) -[[TunnelDirConns]] **TunnelDirConns** **0**|**1**:: - If non-zero, when a directory server we contact supports it, we will build - a one-hop circuit and make an encrypted connection via its ORPort. - (Default: 1) - -[[PreferTunneledDirConns]] **PreferTunneledDirConns** **0**|**1**:: - If non-zero, we will avoid directory servers that don't support tunneled - directory connections, when possible. (Default: 1) - [[CircuitPriorityHalflife]] **CircuitPriorityHalflife** __NUM1__:: If this value is set, we override the default algorithm for choosing which circuit's cell to deliver or relay next. When the value is 0, we |