Nick Mathewson
fc9e84062b
Merge remote-tracking branch 'public/bug4645'
...
Conflicts:
src/or/dirserv.c
2014-04-01 21:49:01 -04:00
Nick Mathewson
408bd98e79
Add one more missing heck on bug4645 fixes
2014-04-01 21:10:14 -04:00
Nick Mathewson
dfc32177d9
Merge remote-tracking branch 'origin/maint-0.2.4'
2014-04-01 21:00:30 -04:00
Nick Mathewson
48578e1512
Merge branch 'bug9213_doc_024' into maint-0.2.4
2014-04-01 20:59:13 -04:00
Nick Mathewson
a68e6ea9c0
Fix documentation of torrc search order
...
We are searching @CONFDIR@ before $HOME, but the documentation
implied otherwise.
I screwed this up in f5e86bcd6c
, when I
first documented the $HOME/.torrc possibility.
Fix for bug 9213; bugfix on 0.2.3.18-rc.
2014-04-01 20:56:03 -04:00
Nick Mathewson
b4b91864bb
Merge remote-tracking branch 'public/bug9870'
...
Conflicts:
src/or/config.c
2014-04-01 20:48:15 -04:00
Nick Mathewson
6bef082d0a
Merge remote-tracking branch 'public/bug11232'
2014-04-01 09:39:48 -04:00
Nick Mathewson
c0441cca8b
Merge branch 'bug8787_squashed'
2014-03-31 11:57:56 -04:00
Nick Mathewson
3118af2d5f
changes file for bug8787
2014-03-31 11:57:40 -04:00
Nick Mathewson
1a9b4bd28c
Munmap the right pointers in routerlist_free()
2014-03-31 11:43:51 -04:00
Nick Mathewson
449b87791d
NULL out all mappings after tor_munmap_file()
2014-03-31 11:42:49 -04:00
Nick Mathewson
8e94d5f22e
Check return values for tor_munmap_file() in unit tests
2014-03-31 11:40:00 -04:00
Nick Mathewson
7cdb50e866
Handle tor_munmap_file(NULL) consistently
2014-03-31 11:35:39 -04:00
Andrea Shepard
dea8190111
Check strftime() return in tortls.c
2014-03-31 11:27:08 -04:00
Andrea Shepard
0938c20fa3
Eliminate lseek() with unchecked return in tor_mmap_file()
2014-03-31 11:27:08 -04:00
Andrea Shepard
abdf1878a3
Always check returns from unlink()
2014-03-31 11:27:08 -04:00
Andrea Shepard
df076eccfa
Always check returns from tor_munmap_file() in microdesc.c
2014-03-31 11:27:08 -04:00
Andrea Shepard
947a6daa31
Always check returns from tor_munmap_file() in routerlist.c
2014-03-31 11:27:08 -04:00
Andrea Shepard
389251eda9
Add return value and assert for null parameter to tor_munmap_file()
2014-03-31 11:27:08 -04:00
Nick Mathewson
4ebad0d947
Merge remote-tracking branch 'public/build_torrify_manpage_again'
2014-03-31 10:52:09 -04:00
Nick Mathewson
f82e499aa5
Merge remote-tracking branch 'public/bug11342'
2014-03-31 10:51:09 -04:00
Nick Mathewson
5e0cfba969
Fix a clang compilation warning
...
Subtracting two time_t values was yielding something that maybe
can't be fit in an int.
Bugfix on 0389d4aa; bug not in any released Tor.
2014-03-31 10:07:42 -04:00
Nick Mathewson
bfe783f167
Make dump_desc() use binary mode
...
Otherwise, it could mung the thing that came over the net on windows,
which would defeat the purpose of recording the unparseable thing.
Fixes bug 11342; bugfix on 0.2.2.1-alpha.
2014-03-27 23:53:03 -04:00
Nick Mathewson
9efd970dd9
Merge branch 'bug9658_refactor'
2014-03-27 23:00:28 -04:00
Nick Mathewson
6ad7f3417c
Renamed "onionskins_completed" to "onionskins_assigned"
...
This improves the accuracy of the function/variable names.
2014-03-27 22:57:53 -04:00
Nick Mathewson
0f395a7c06
Merge remote-tracking branch 'origin/maint-0.2.4'
2014-03-27 15:35:11 -04:00
Nick Mathewson
24e0b1088a
whitespace fix
2014-03-27 15:34:57 -04:00
Nick Mathewson
2721246f5d
Merge branch 'bug7164_diagnose_harder_v2'
2014-03-27 14:26:21 -04:00
Nick Mathewson
0389d4aa56
More logs to try to diagnose bug 7164
...
This time, check in microdesc_cache_clean() to see what could be
going wrong with an attempt to clean a microdesc that's held by a node.
2014-03-27 14:23:19 -04:00
Nick Mathewson
cd15172444
Fix version number in changes/bug11296
2014-03-26 14:10:07 -04:00
Nick Mathewson
91f6a422cc
Fix build of torify.1
...
The build was broken by changes in f8c45339f7
, but we didn't
notice, since that commit also made torify.1 only get built when
tor-fw-helper was turned on.
Fixes bug 11321; bugfix on Tor 0.2.5.1-alpha.
2014-03-26 12:12:54 -04:00
Nick Mathewson
0b43c499b2
Merge remote-tracking branch 'public/bug11296'
2014-03-26 11:46:51 -04:00
Nick Mathewson
6da2544f20
Turn off testing code for #9683 .
...
(This wasn't supposed to get committed turned-on.)
2014-03-26 10:31:56 -04:00
Nick Mathewson
07eb481492
Demote "Invalid length on ESTABLISH_RENDEZVOUS" to protocol_warn
...
Fixes bug 11279
2014-03-25 11:55:27 -04:00
Nick Mathewson
d5e11f21cc
Fix warnings from doxygen
...
Most of these are simple. The only nontrivial part is that our
pattern for using ENUM_BF was confusing doxygen by making declarations
that didn't look like declarations.
2014-03-25 11:27:43 -04:00
Nick Mathewson
c3dd2e3d9e
Make the redox script sorta work again.
2014-03-25 11:01:09 -04:00
Nick Mathewson
e83eddd113
Add missing -Isrc/ext to tor-fw-helper/include.am
...
We need this now that tor-fw-helper will pull in siphash.h
Fixes bug 11296; bugfix on 0.2.5.4-alpha where siphash.h was introduced.
2014-03-25 10:21:07 -04:00
Nick Mathewson
1a7794e475
Merge remote-tracking branch 'public/bug11061_024'
2014-03-25 10:02:22 -04:00
Nick Mathewson
5e9672904c
Fix SOCKSPort documentation layout
...
In the end this required a slightly nasty hack using a dummy anchor as
an option heading in order to make the "Other recognized __flags__"
line indent properly.
Fixes bug 11061; Bugfix on 61d740ed
.
2014-03-25 10:01:08 -04:00
Roger Dingledine
85ef58e5ba
quiet the debug message in circuit_build_times_disabled()
...
something recently made it get called once per second, which will clutter
up your debug log file.
2014-03-24 02:33:17 -04:00
Nick Mathewson
a6afebd8de
Changes file for bug 11276.
...
The crypto_early_init() function could only be called at most twice,
and both of those were during startup. AFAICT leaking the first set
of locks was the only non-idempotent thing.
2014-03-23 15:59:51 -04:00
Nick Mathewson
6709a1f58d
Merge remote-tracking branch 'arma/bug11276'
2014-03-23 15:57:56 -04:00
Nick Mathewson
3ddbf2880f
Merge remote-tracking branch 'public/bug11275_024'
2014-03-23 15:56:23 -04:00
Nick Mathewson
b00f10b9fd
changes file for bug 11275
2014-03-23 15:55:13 -04:00
Roger Dingledine
eff16e834b
Stop leaking 'sig' at each call of router_append_dirobj_signature()
...
The refactoring in commit cb75519b
(tor 0.2.4.13-alpha) introduced
this leak.
2014-03-23 15:53:51 -04:00
Roger Dingledine
ddaeb4deee
Be more lenient in our fix for bug 11149
...
There are still quite a few 0.2.3.2x relays running for x<5, and while I
agree they should upgrade, I don't think cutting them out of the network
is a net win on either side.
2014-03-23 02:53:08 -04:00
Roger Dingledine
c08b47977e
Never run crypto_early_init() more than once
...
Previously we had set up all the infrastructure to avoid calling it
after the first time, but didn't actually use it.
2014-03-23 00:38:17 -04:00
Nick Mathewson
f560eeadc3
Remove the unused circuit_dump_by_chan().
...
Also remove its helper function.
2014-03-23 00:28:39 -04:00
Nick Mathewson
2cfc4453c2
Merge remote-tracking branch 'public/bug9683_rebased'
2014-03-23 00:20:05 -04:00
Nick Mathewson
f4e2c72bee
Merge remote-tracking branch 'karsten/task-11070'
2014-03-23 00:18:48 -04:00