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
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
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
Sebastian Hahn
80e57af50f
Appease clang - and my tortured mind
...
This possible div by 0 warning from clang's analyzer was quite fun to
track down. Turns out the current behaviour is safe.
2011-05-09 13:19:45 -04:00
Sebastian Hahn
58a16a4d6f
Add an assert to un-confuse clang's analyzer
...
The analyzer assumed that bootstrap_percent could be less than 0 when we
call control_event_bootstrap_problem(), which would mean we're calling
log_fn() with undefined values. The assert makes it clear this can't
happen.
2011-05-09 13:19:44 -04:00
Sebastian Hahn
532c13693e
Fix a docstring
2011-05-09 13:19:44 -04:00
Sebastian Hahn
e36f9d1d9b
Link to libevent_openssl statically when requested
...
When configure tor with --enable-bufferevents and
--enable-static-libevent, libevent_openssl would still be linked
dynamically. Fix this and refactor src/or/Makefile.am along the way.
2011-05-06 15:38:32 +02:00
Nick Mathewson
a740994c77
Fix check-spaces issues in master
2011-05-05 21:56:52 -04:00
Nick Mathewson
1065a5ef29
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-05-05 21:54:04 -04:00
Nick Mathewson
330116f034
Fix up some check-spaces issues
2011-05-05 21:53:46 -04:00
Nick Mathewson
ad35b8f40d
Merge branch 'microdesc-use-v2-squashed'
2011-05-05 21:01:03 -04:00
Nick Mathewson
85ddc76bf1
Make microdesc use off-by-default for now, since there are not enough caches
2011-05-05 20:54:14 -04:00
Nick Mathewson
9d4c32dd2f
Now that 0.2.3.1-alpha is out, require it for microdesc fetches
2011-05-05 20:54:14 -04:00
Nick Mathewson
711100c597
Move dummy authority.z fetch out of update_router_descriptor_downloads
...
To make sure that a server learns if its IP has changed, the server
sometimes launches authority.z descriptor fetches from
update_router_descriptor_downloads. That's nice, but we're moving
towards a situation where update_router_descriptor_downloads doesn't
always get called. So this patch breaks the authority.z
check-and-fetch into a new function.
This function also renames last_routerdesc_download to a more
appropriate last_descriptor_download, and adds a new
update_all_descriptor_downloads() function.
(For now, this is unnecessary, since servers don't actually use
microdescriptors. But that could change, or bridges could start
using microdescriptors, and then we'll be glad this is refactored
nicely.)
2011-05-05 20:54:13 -04:00
Nick Mathewson
4cc348e896
Code to make clients fetch and use microdescriptors for circuit building
...
To turn this on, set UseMicrodescriptors to "1" (or "auto" if you
want it on-if-you're-a-client). It should go auto-by-default once
0.2.3.1-alpha is released.
Because of our node logic, directory caches will never use
microdescriptors when they have the right routerinfo available.
2011-05-05 20:54:12 -04:00
Nick Mathewson
3df22887a3
Replace _AUTHORITY enum values with _DIRINFO values (automted)
2011-05-05 20:54:12 -04:00
Nick Mathewson
6e58575767
Automated rename from authority_type_t to dirinfo_type_t
...
We were already overloading this type to mean "a directory that can
serve us X" in addition to "a directory that is an authority for X."
2011-05-05 20:54:11 -04:00
Nick Mathewson
ba1143e468
Add a new configuration type, "AUTOBOOL", to handle 1/0/auto types
...
We only have one of these now, but I'm about to add a few more.
Yes, I have already thought of the "Filenotfoundian logic" joke.
2011-05-05 20:54:11 -04:00
Andrew Lewman
be7e8f5bb9
fix the website directions.
2011-05-05 15:28:29 -04:00
Nick Mathewson
08e6bd0ed1
Increment version to 0.2.3.1-alpha-dev
2011-05-05 15:15:20 -04:00
Nick Mathewson
5cabdc8f67
more changelog tweaks, mostly from sebastian
2011-05-05 14:57:34 -04:00
Nick Mathewson
5ed719fd6c
Increment version to 0.2.3.1-alpha
2011-05-05 13:42:03 -04:00
Nick Mathewson
3b0140b811
Tweak 0.2.3.1-alpha changelog, add more entries.
2011-05-05 13:43:15 -04:00
Nick Mathewson
d8cb4f9f0c
Use read_all() to read messages from spawn_background
...
Using read() is an invitation to get some of the data you want, not all.
Possible fix for bug 2462
2011-05-04 23:32:18 -04:00
Nick Mathewson
08efa70c41
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-05-04 23:29:56 -04:00
Nick Mathewson
9583a534ac
Merge remote-tracking branch 'rransom/bug3106' into maint-0.2.2
2011-05-04 23:18:47 -04:00
Robert Ransom
66339f74b4
Handle crypto_pk_get_digest failures semi-sensibly
...
Fixes bug 3106.
2011-05-04 20:06:24 -07:00
Nick Mathewson
7de3a19497
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-05-04 20:33:38 -04:00
Nick Mathewson
ab1460f3ae
Merge remote-tracking branch 'sebastian/win_warning' into maint-0.2.2
2011-05-04 20:33:16 -04:00
Sebastian Hahn
9a490bb53b
Fix compile warning on windows
2011-05-05 02:22:46 +02:00
Nick Mathewson
4c9bd06d0d
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-05-04 17:38:33 -04:00
Nick Mathewson
0ee524b57f
Merge branch 'bug2379' into maint-0.2.2
2011-05-04 17:37:56 -04:00
Nick Mathewson
699af20e9a
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-05-04 17:21:44 -04:00
Nick Mathewson
29f1ffa0fe
More notes on how to upload tarballs from erinn
2011-05-04 17:21:33 -04:00
Nick Mathewson
b04dca448d
Add some missing torrc entries to tor.1.txt
...
Fixes bug 2379
2011-05-03 22:14:40 -04:00
Nick Mathewson
fac99f01da
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-05-03 21:54:18 -04:00
