Nick Mathewson
6a8861574b
Merge remote-tracking branch 'origin/maint-0.2.3'
2012-09-12 11:09:10 -04:00
Nick Mathewson
4aff97cfc7
6819: typo in torrc.sample.in
2012-09-12 11:08:30 -04:00
Nick Mathewson
5cbeb60805
Fix directory self-testing logic
...
When I removed version_supports_begindir, I accidentally removed the
mechanism we had been using to make a directory cache self-test its
directory port. This caused bug 6815, which caused 6814 (both in
0.2.4.2-alpha).
To fix this bug, I'm replacing the "anonymized_connection" argument to
directory_initiate_command_* with an enumeration to say how indirectly
to connect to a directory server. (I don't want to reinstate the
"version_supports_begindir" argument as "begindir_ok" or anything --
these functions already take too many arguments.)
For safety, I made sure that passing 0 and 1 for 'indirection' gives
the same result as you would have gotten before -- just in case I
missed any 0s or 1s.
2012-09-12 10:26:59 -04:00
Roger Dingledine
5977da6c60
hot: we fixed incancations to be intancations.
2012-09-12 02:51:33 -04:00
Nick Mathewson
75c9ccd4f8
Merge remote-tracking branch 'public/bug6538'
...
Conflicts:
configure.ac
2012-09-11 17:51:36 -04:00
Roger Dingledine
b8f93c5dd7
put all the changelogs into master
2012-09-11 14:36:54 -04:00
Nick Mathewson
f8a665c87d
Merge remote-tracking branch 'origin/maint-0.2.3'
2012-09-11 13:21:20 -04:00
Nick Mathewson
5833861f62
Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3
...
Conflicts:
src/test/test_util.c
2012-09-11 13:20:15 -04:00
Nick Mathewson
84f47ffc46
Merge branch 'timegm_assert_v3_squashed' into maint-0.2.2
2012-09-11 13:14:43 -04:00
Nick Mathewson
973c18bf0e
Fix assertion failure in tor_timegm.
...
Fixes bug 6811.
2012-09-11 13:13:07 -04:00
Nick Mathewson
99cb9696ac
Bump version to 0.2.4.2-alpha-dev
2012-09-10 19:49:20 -04:00
Roger Dingledine
77d17a3607
fold in another
2012-09-10 18:28:41 -04:00
Roger Dingledine
d85b563dbb
Merge branch 'maint-0.2.3'
2012-09-10 18:25:57 -04:00
Roger Dingledine
19b2126119
give 0.2.4.2-alpha a blurb
2012-09-10 18:04:23 -04:00
Roger Dingledine
73c13baa97
bump to 0.2.4.2-alpha
2012-09-10 17:38:50 -04:00
Roger Dingledine
f949f61569
fold in recent changes files
2012-09-10 17:36:36 -04:00
Nick Mathewson
bf71866da0
Merge branch 'remove_old_ver_checks'
2012-09-10 15:37:13 -04:00
Nick Mathewson
4319f99828
Merge remote-tracking branch 'public/ticket6789'
2012-09-10 15:31:04 -04:00
Nick Mathewson
7ff5c3f232
Downgrade "EVP ctr128 is ok" message to info
...
Part of 6736 effort to try to make startup quieter.
2012-09-10 10:38:22 -04:00
Nick Mathewson
8731a4e148
Avoid segfault when reading state file from ancient tor
...
If s_values is null in rep_hist_load_bwhist_state_section, we would
call smartlist_len() on it, and die.
Fixes bug 6801.
2012-09-10 10:35:18 -04:00
Nick Mathewson
cb8f64cdc8
Fix tab introduced in f43946829c
2012-09-10 10:22:40 -04:00
Nick Mathewson
3e8058f9ed
Be more clear in changes file for 6797.
2012-09-10 10:21:46 -04:00
Nick Mathewson
0ab7716b9e
Merge remote-tracking branch 'linus/bug6797'
2012-09-10 10:19:57 -04:00
Nick Mathewson
344bb1d64c
Merge branch 'bug3155'
2012-09-10 10:09:29 -04:00
Nick Mathewson
20e0e7d9d1
Rename _UseFilteringSSLBufferevents to lose its _. Bug 3155
2012-09-10 10:09:19 -04:00
Nick Mathewson
38f3f3baf9
bug3155 changes file
2012-09-10 10:04:30 -04:00
meejah
f43946829c
Hide options beginning with "___" from GETINFO config/names
2012-09-10 09:51:31 -04:00
meejah
65838f4883
rename _UsingTestNetworkDefaults to start with triple-underscore
2012-09-10 09:50:24 -04:00
Roger Dingledine
e1e34ee4e4
raise bandwidthrate/bandwidthburst to a new "infinite"
...
addresses bug 6605.
2012-09-10 03:03:06 -04:00
Linus Nordberg
93ee62297f
Don't follow the NULL pointer.
...
If dirvote_create_microdescriptor() returns NULL, don't use md.
Found by "f. tp.".
Fixes bug 6797.
2012-09-10 00:43:48 +02:00
Roger Dingledine
f6639d5676
finish backing out 5492de76
2012-09-09 16:51:34 -04:00
Roger Dingledine
67abdcd8d9
minor logging improvement
2012-09-09 15:54:59 -04:00
Roger Dingledine
96d86b3cff
retroactively list a ticket number for patch 3946.
2012-09-08 23:45:31 -04:00
Nick Mathewson
e8b09c0d51
Remove one more check for an insanely old version
2012-09-07 23:23:49 -04:00
Nick Mathewson
7988596f66
Remove version_supports checks for versions before 0.2.2.
2012-09-07 23:21:18 -04:00
Nick Mathewson
2cde6658b5
Fix whitespace in Makefile.am
2012-09-07 14:46:03 -04:00
Ondrej Mikle
43c86bbc70
Removed dependency on tor.spec. Removed tor.spec.in.
2012-09-07 14:44:53 -04:00
Nick Mathewson
26cee96911
Dirservers no longer accept tors released before December 2011.
...
Implements ticket 6789.
2012-09-07 11:15:23 -04:00
Nick Mathewson
3fe2161d28
Merge remote-tracking branch 'asn/bug6788'
2012-09-07 10:51:38 -04:00
George Kadianakis
14f4a5da45
Remove redundant declaration of find_transport_name_by_bridge_addrport().
2012-09-07 17:44:53 +03:00
Roger Dingledine
78a3de1443
the 0.2.1.32 changelog got lost in the shuffle
2012-09-07 04:32:14 -04:00
Roger Dingledine
9446efc0df
a debugging log line that just helped me
2012-09-07 03:04:15 -04:00
Nick Mathewson
f4cf279eb5
Rename extend_info_alloc() --> _new()
...
Based on a patch from Linus, regenerated so as to not conflict with
Linus's 5535/6363 patches.
2012-09-06 11:38:32 -04:00
Linus Nordberg
09c84b50e7
Rename packed_cell_alloc() --> _new().
2012-09-06 11:37:00 -04:00
Linus Nordberg
3327a0a61c
Rename config_alloc() --> _new().
2012-09-06 11:37:00 -04:00
Nick Mathewson
1ca9e2685f
Merge branch 'quiet_lib_versions_squashed'
2012-09-06 11:32:09 -04:00
Nick Mathewson
7607ad2bec
Detect openssl header version doesn't match runtime version
...
We already do this for libevent; let's do it for openssl too.
For now, I'm making it always a warn, since this has caused some
problems in the past. Later, we can see about making it less severe.
2012-09-06 11:31:30 -04:00
Nick Mathewson
e3a130a7eb
Don't log about Libevent/OpenSSL initialization when all's well
...
OTOH, log the Libevent and OpenSSL versions on the first line when
we're starting Tor.
2012-09-06 11:31:22 -04:00
Nick Mathewson
ad1e8b45df
Merge branch 'bug6778'
2012-09-06 11:05:16 -04:00
Nick Mathewson
30fe9080e7
Fix a dependency: micro-revision.i influences tor_main.o, not tor_main.c
2012-09-06 11:00:32 -04:00
