Nick Mathewson
5fec8fe559
"(Socks|Control|etc)Port auto" now tells Tor to open an arbitrary port
...
This is the major part of the implementation for trac issue 3076.
2011-05-13 10:41:18 -04:00
Nick Mathewson
87c79cf017
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-05-12 19:41:59 -04:00
Nick Mathewson
e0d5a6e184
Downgrade the "we launched 10 circuits for this stream" message. (See bug 3080)
2011-05-12 19:41:08 -04:00
Nick Mathewson
730dce46af
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-05-12 19:27:25 -04:00
Nick Mathewson
af85017177
Merge remote-tracking branch 'public/bug3122_memcmp_023'
2011-05-12 19:27:18 -04:00
Nick Mathewson
98870f2ead
Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2
2011-05-12 19:25:21 -04:00
Nick Mathewson
59a6df8882
Merge remote-tracking branch 'public/bug3122_memcmp_022' into maint-0.2.2
2011-05-12 19:25:14 -04:00
Nick Mathewson
1f678277a1
Merge remote-tracking branch 'public/bug3122_memcmp_squashed' into maint-0.2.1
2011-05-12 19:20:40 -04:00
Nick Mathewson
696cd1cfe2
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-05-12 18:51:33 -04:00
Nick Mathewson
379de3d10a
Add changes file for bug2503
2011-05-12 18:49:28 -04:00
mikey99
42fcf059d2
Fixes ticket #2503
...
HTTPS error code 403 is now reported as:
"The https proxy refused to allow connection".
Used a switch statement for additional error codes to be explained
in the future.
2011-05-12 17:33:09 -04:00
Nick Mathewson
8fa7bcead5
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-05-12 11:36:41 -04:00
Nick Mathewson
2c88dd7f95
Clean up a formatting issue on the manpge; bug3154.
2011-05-12 11:36:20 -04:00
Nick Mathewson
621e95a4f3
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-05-12 11:21:59 -04:00
Nick Mathewson
bdff7e3299
Unmap microdesc cache before replacing it.
...
If we do a replace-then-munmap, windows will never actually rewrite
the microdesc cache.
Found by wanoskarnet; bugfix on 0.2.2.6-alpha.
2011-05-12 11:19:52 -04:00
Robert Ransom
c714a098ea
Improve a documentation comment
2011-05-12 02:57:09 -07:00
Robert Ransom
cb9df5e53c
Fix comment typo
2011-05-12 00:27:19 -07:00
Nick Mathewson
7779c63e93
Accept hs descriptors even if we don't see an HSDir for us
...
The old behavior contributed to unreliability when hidden services and
hsdirs had different consensus versions, and so had different opinions
about who should be cacheing hsdir info.
Bugfix on 0.2.0.10-alpha; based on discussions surrounding bug 2732.
2011-05-12 00:53:07 -04:00
Nick Mathewson
6b83b3ba2a
bug 3026: do not upload our vote to ourself
2011-05-12 00:47:00 -04:00
Nick Mathewson
3968e8d14b
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-05-12 00:14:44 -04:00
Nick Mathewson
b47f574c1e
Merge branch 'bug1352' into maint-0.2.2
2011-05-12 00:14:10 -04:00
Nick Mathewson
7649adbce6
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-05-11 22:55:29 -04:00
Nick Mathewson
8057b7363e
Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2
2011-05-11 22:52:26 -04:00
Nick Mathewson
d1c7f65a8e
Merge branch 'bug3135' into maint-0.2.1
2011-05-11 22:49:44 -04:00
Nick Mathewson
13847b8db6
Fix crash when read_file_to_string() fails in SAVECONF
...
The new behavior is to try to rename the old file if there is one there
that we can't read. In all likelihood, that will fail too, but at least
we tried, and at least it won't crash.
2011-05-11 22:05:41 -04:00
Nick Mathewson
9e16a418f9
Hand-tune the new tor_memcmp instances in 0.2.3
2011-05-11 16:46:38 -04:00
Nick Mathewson
7267647bd7
Reapply the automated memcmp conversion to 0.2.3 to catch newly added memcmps
2011-05-11 16:41:14 -04:00
Nick Mathewson
9fba014e3f
Merge remote-tracking branch 'public/bug3122_memcmp_022' into bug3122_memcmp_023
...
Conflicts in various places, mainly node-related. Resolved them in
favor of HEAD, with copying of tor_mem* operations from bug3122_memcmp_022.
src/common/Makefile.am
src/or/circuitlist.c
src/or/connection_edge.c
src/or/directory.c
src/or/microdesc.c
src/or/networkstatus.c
src/or/router.c
src/or/routerlist.c
src/test/test_util.c
2011-05-11 16:39:45 -04:00
Nick Mathewson
8fb38331c3
Hand-tune the new tor_memcmp instances in 0.2.2
2011-05-11 16:32:30 -04:00
Nick Mathewson
0cbcbc3412
Re-apply the automated conversion to 0.2.2 to make handle any memcmps that snuck in
2011-05-11 16:27:27 -04:00
Nick Mathewson
9964c314c6
fwd-port test_util_di_ops into tinytest format
2011-05-11 16:25:51 -04:00
Nick Mathewson
44ad734573
Merge remote-tracking branch 'public/3122_memcmp_squashed' into bug3122_memcmp_022
...
Conflicts throughout. All resolved in favor of taking HEAD and
adding tor_mem* or fast_mem* ops as appropriate.
src/common/Makefile.am
src/or/circuitbuild.c
src/or/directory.c
src/or/dirserv.c
src/or/dirvote.c
src/or/networkstatus.c
src/or/rendclient.c
src/or/rendservice.c
src/or/router.c
src/or/routerlist.c
src/or/routerparse.c
src/or/test.c
2011-05-11 16:24:29 -04:00
Nick Mathewson
59f9097d5c
Hand-conversion and audit phase of memcmp transition
...
Here I looked at the results of the automated conversion and cleaned
them up as follows:
If there was a tor_memcmp or tor_memeq that was in fact "safe"[*] I
changed it to a fast_memcmp or fast_memeq.
Otherwise if there was a tor_memcmp that could turn into a
tor_memneq or tor_memeq, I converted it.
This wants close attention.
[*] I'm erring on the side of caution here, and leaving some things
as tor_memcmp that could in my opinion use the data-dependent
fast_memcmp variant.
2011-05-11 16:12:51 -04:00
Nick Mathewson
db7b2a33ee
Automated conversion of memcmp to tor_memcmp/tor_mem[n]eq
...
This commit is _exactly_ the result of
perl -i -pe 's/\bmemcmp\(/tor_memcmp\(/g' src/*/*.[ch]
perl -i -pe 's/\!\s*tor_memcmp\(/tor_memeq\(/g' src/*/*.[ch]
perl -i -pe 's/0\s*==\s*tor_memcmp\(/tor_memeq\(/g' src/*/*.[ch]
perl -i -pe 's/0\s*!=\s*tor_memcmp\(/tor_memneq\(/g' src/*/*.[ch]
git checkout src/common/di_ops.[ch]
git checkout src/or/test.c
git checkout src/common/test.h
2011-05-11 16:12:51 -04:00
Nick Mathewson
1d703ed22b
Add a "di_ops.h" include to util.h
2011-05-11 16:12:51 -04:00
Nick Mathewson
4b19730c82
Add a data-independent variant of memcmp and a d-i memeq function.
...
The tor_memcmp code is by Robert Ransom, and the tor_memeq code is
by me. Both incorporate some ideas from DJB's stuff.
2011-05-11 16:12:33 -04:00
Roger Dingledine
6d5478a8a7
Merge branch 'maint-0.2.2'
2011-05-10 23:06:12 -04:00
Roger Dingledine
7206d784dc
Merge branch 'maint-0.2.1' into maint-0.2.2
2011-05-10 23:05:51 -04:00
Roger Dingledine
e7b10e5ecf
Update to the May 1 2011 Maxmind GeoLite Country database
2011-05-10 23:04:11 -04:00
Roger Dingledine
ec25c1f6ca
another changelog heuristic based on 0.2.3.1-alpha
2011-05-10 21:30:55 -04:00
Robert Ransom
b7452dcbcb
Fix comment typo
2011-05-10 05:15:02 -07:00
Nick Mathewson
e6980faec4
Merge remote-tracking branch 'origin/maint-0.2.2'
...
Conflicts:
src/or/directory.c
2011-05-09 13:39:51 -04:00
Nick Mathewson
09d7af7789
Merge remote-tracking branch 'public/bug3022_v2' into maint-0.2.2
2011-05-09 13:37:56 -04:00
Nick Mathewson
acd6a4856b
Merge remote-tracking branch 'origin/maint-0.2.2'
...
Conflicts:
src/or/connection.c
2011-05-09 13:36:40 -04:00
Nick Mathewson
0b3166fffa
Merge branch 'clang_fixes' into maint-0.2.2
2011-05-09 13:20:04 -04:00
Sebastian Hahn
9da4e25183
Remove some dead code, found by clang
2011-05-09 13:19:46 -04:00
Sebastian Hahn
d7d25558fa
Remove a duplicated line, found by clang
2011-05-09 13:19:46 -04:00
Sebastian Hahn
1c668540fe
Fix potential null pointer deref during dirvote
...
Found by using clang's analyzer.
2011-05-09 13:19:46 -04:00
Sebastian Hahn
1827e60976
Fix a potential null deref when rebuilding md cache
...
Issue discovered using clang's static analyzer
2011-05-09 13:19:45 -04:00
Sebastian Hahn
8ebb3ce6e2
CONN_LOG_PROTECT()'s first argument may not be 0
...
Make that explicit by adding an assert and removing a null-check. All of
its callers currently depend on the argument being non-null anyway.
Silences a few clang complaints.
2011-05-09 13:19:45 -04:00
