Roger Dingledine
7516b4ac99
forward-port the 0.2.2.37 changelog
2012-06-12 07:50:34 -04:00
Roger Dingledine
2294d16113
fold in changes files so far
2012-06-12 04:21:39 -04:00
Nick Mathewson
f0f70ba6f1
Merge branch 'bug5452'
2012-06-11 14:44:26 -04:00
Nick Mathewson
b44cb4aef8
Call bug5452 fix a feature; note its trac number in the changes file
2012-06-11 14:44:08 -04:00
Andrea Shepard
997ed7807b
Add change file for 5452
2012-06-11 11:17:59 -07:00
Andrea Shepard
6b73fad709
Make RECOMMENDED_MIN_CIRCUIT_BUILD_TIMEOUT warning tell the user how to fix it.
2012-06-11 11:09:19 -07:00
Nick Mathewson
a6dac69aac
Remove a couple of debugging "echo"s that snuck into configure.in
2012-06-11 11:30:43 -04:00
Nick Mathewson
667a12b471
Merge remote-tracking branch 'public/bug4592'
2012-06-11 10:34:48 -04:00
Nick Mathewson
70910479e3
Merge remote-tracking branch 'public/bug5598'
...
Conflicts:
doc/tor.1.txt
Conflict was on a formatting issue in the manpage.
2012-06-11 10:26:48 -04:00
Nick Mathewson
a6180b7f29
Merge branch 'bug6097'
2012-06-11 10:14:01 -04:00
Nick Mathewson
cb01aaea12
Merge branch 'bug2865'
2012-06-11 09:53:49 -04:00
Nick Mathewson
2d127eacd9
List defaults consistently in manpage
...
Nearly everywhere, we end options with "(Default: foo)". But in a
few places, we inserted an extra period after or before the close
parenthesis, and in a few other places we said "(Defaults to foo)".
Let's not do that.
2012-06-11 09:52:43 -04:00
Andrea Shepard
4fb2a14fae
Warn if the user has set CircuitBuildTimeout stupidly low and turned off LearnCircuitBuildTimeout
2012-06-08 23:44:06 -07:00
Nick Mathewson
8be6058d8f
changes file and whitespace fix for bug5235 patch
2012-06-08 14:33:16 -04:00
Andrea Shepard
554ec65ce7
Rate-limit 'Weighted bandwidth is 0.000000 ...' message; it can be produced in extreme quantities
2012-06-08 14:33:16 -04:00
Roger Dingledine
167f6f1e96
typo noticed by "_raptor"
2012-06-07 15:35:19 -04:00
Nick Mathewson
b74f851861
Correct the defaults for the *Statistics options
2012-06-07 13:46:51 -04:00
Nick Mathewson
b0bab82790
Merge remote-tracking branch 'arma/bug3886'
...
Conflicts:
src/or/dirserv.c
2012-06-07 13:30:55 -04:00
Nick Mathewson
bf9252587b
Fix mingw build with -DUNICODE -D_UNICODE
...
This is a very blunt fix, and mostly just turns some func() calls
into FuncA() to make things build again. Fixes bug 6097.
2012-06-07 11:59:32 -04:00
Nick Mathewson
1e5683b167
Be more careful calling wcstombs
...
The function is not guaranteed to NUL-terminate its output. It
*is*, however, guaranteed not to generate more than two bytes per
multibyte character (plus terminating nul), so the general approach
I'm taking is to try to allocate enough space, AND to manually add a
NUL at the end of each buffer just in case I screwed up the "enough
space" thing.
Fixes bug 5909.
2012-06-07 11:09:38 -04:00
Nick Mathewson
99618a9641
Merge remote-tracking branch 'origin/maint-0.2.2'
2012-06-07 09:46:14 -04:00
Roger Dingledine
b4126dcd22
apply 6abb638954
to 0.2.3.16-alpha too
2012-06-07 03:55:12 -04:00
Robert Ransom
0dc47dfebf
Send a CRLF at the end of a STATUS_* event, not in the middle of it
...
Fixes bug 6094; bugfix on commit 3a9351b57e
.
2012-06-07 03:22:06 +00:00
Nick Mathewson
8a341cc429
Change the default for DynamicDHGroups to 0
...
This feature can make Tor relays less identifiable by their use of the
mod_ssl DH group, but at the cost of some usability (#4721 ) and bridge
tracing (#6087 ) regressions.
We should try to turn this on by default again if we find that the
mod_ssl group is uncommon and/or we move to a different DH group size
(see #6088 ). Before we can do so, we need a fix for bugs #6087 and
Resolves ticket #5598 for now.
2012-06-06 12:00:04 -04:00
Roger Dingledine
0ee13dc287
use my time machine to fix a few more typos
2012-06-06 00:30:25 -04:00
Roger Dingledine
f136e835d8
bump to 0.2.3.16-alpha-dev
2012-06-05 18:37:19 -04:00
Roger Dingledine
9ca5fa5984
use my time machine to fix the changelog
2012-06-05 18:36:58 -04:00
Roger Dingledine
e94606a76b
add a blurb for 0.2.3.16-alpha
2012-06-05 18:28:52 -04:00
Roger Dingledine
80b2308aec
today is the day for 0.2.3.16-alpha
2012-06-05 12:14:57 -04:00
Roger Dingledine
85a98b058c
start folding in the changes files
2012-06-05 12:05:31 -04:00
Nick Mathewson
7b2afb61b2
Merge branch 'bug5603'
2012-06-05 11:47:34 -04:00
Nick Mathewson
7cad2e7348
Changes file for bug 5603
2012-06-05 11:47:16 -04:00
Nick Mathewson
64167e1772
Minor changes to bug5603
...
* Minor stylistic changes to comments and doxygen
* Use strcmp_opt; it already exists.
* Tighten bridge_has_digest implementation a little.
2012-06-05 11:40:31 -04:00
Nick Mathewson
d09a3ecd01
Merge remote-tracking branch 'public/getfilesize_64'
...
Conflicts:
src/common/compat.c
The getfilesize change conflicted with the removal of file_handle
from the windows tor_mmap_t.
2012-06-05 11:10:42 -04:00
Nick Mathewson
b482c870ca
Fix some mingw build warnings
...
These include:
- Having a weird in_addr that can't be initialized with {0}
- Needing INVALID_HANDLE_VALUE instead of -1 for file handles.
- Having a weird dependent definition for struct stat.
- pid is signed, not unsigned.
2012-06-05 11:06:26 -04:00
Nick Mathewson
2468a1bd2c
Revert "Disable (Cell,DirReq,Entry,ExitPort)Statistics on bridges"
...
This reverts commit 981e896dd2
.
Apparently Karsten still needs DirReqStatistics for bridges; see
2012-06-05 10:47:05 -04:00
Nick Mathewson
38642a9369
Downgrade tor_assert(0) to tor_fragile_assert() in windows stub create_unix_sockaddr
2012-06-05 10:36:34 -04:00
Nick Mathewson
7f45ea5c41
Merge remote-tracking branch 'public/bug3894'
2012-06-05 10:31:00 -04:00
Nick Mathewson
b4bd4964eb
Merge remote-tracking branch 'public/format_doubles'
...
Conflicts:
src/or/geoip.c
2012-06-05 10:30:50 -04:00
Nick Mathewson
981e896dd2
Disable (Cell,DirReq,Entry,ExitPort)Statistics on bridges
...
These stats are currently discarded, but we might as well
hard-disable them on bridges, to be clean.
Fix for bug 5824; bugfix on 0.2.1.17-rc.
Patch originally by Karsten Loesing.
2012-06-05 10:25:50 -04:00
Nick Mathewson
1ce0c5eba9
Merge remote-tracking branch 'public/bug4657'
...
Conflicts:
src/or/router.c
2012-06-05 10:20:44 -04:00
Nick Mathewson
c19a2ff691
Merge remote-tracking branch 'public/bug4710'
2012-06-05 10:16:28 -04:00
Nick Mathewson
20d6f787aa
Fix "make check-spaces" issues
2012-06-05 00:49:18 -04:00
Nick Mathewson
913067f788
Resolve about 24 DOCDOCs
2012-06-05 00:17:54 -04:00
Nick Mathewson
064e7c19c6
Missing copyright/license statement for procmon.c
2012-06-04 21:02:13 -04:00
Nick Mathewson
0fa107a6aa
Update copyright dates to 2012; add a few missing copyright statements
2012-06-04 20:58:17 -04:00
Nick Mathewson
173b18c79b
Add about 60 more DOCDOC comments to 0.2.3
...
Also, try to resolve some doxygen issues. First, define a magic
"This is doxygen!" macro so that we take the correct branch in
various #if/#else/#endifs in order to get the right documentation.
Second, add in a few grouping @{ and @} entries in order to get some
variables and fields to get grouped together.
2012-06-04 19:59:08 -04:00
Nick Mathewson
b353cd7e50
Update the "redox" doxygen/DOCDOC postprocessing script
...
Somewhere along the line, doxygen and tor changed their behavior a
little. The script is still a dreadful kludge, but now at least it
sorta works again.
2012-06-04 19:56:44 -04:00
Nick Mathewson
361260ff8f
Resolve some markup complaints from doxygen
2012-06-04 19:56:33 -04:00
Nick Mathewson
f68c042637
Resolve all currently pending DOCDOC items in master
2012-06-04 19:05:51 -04:00