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
b4b91864bb
Merge remote-tracking branch 'public/bug9870'
...
Conflicts:
src/or/config.c
2014-04-01 20:48:15 -04:00
Nick Mathewson
c0441cca8b
Merge branch 'bug8787_squashed'
2014-03-31 11:57:56 -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
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
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
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
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
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
3ddbf2880f
Merge remote-tracking branch 'public/bug11275_024'
2014-03-23 15:56:23 -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
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
Nick Mathewson
f2c6c5e69c
Merge branch 'ticket11149'
2014-03-23 00:18:11 -04:00
Andrea Shepard
3b31b45ddb
Appease make check-spaces
2014-03-18 10:26:44 -07:00
Karsten Loesing
7450403410
Take out remaining V1 directory code.
2014-03-18 10:40:10 +01:00
Nick Mathewson
d769cab3e5
Defensive programming: null [pn]_chan,circ_id in circuit_mark_for_close_
...
Doing this as part of the patch for #9683 to prevent possible bugs
down the line
2014-03-14 11:58:34 -04:00
Nick Mathewson
1a74360c2d
Test code for implementation of faster circuit_unlink_all_from_channel
...
This contains the obvious implementation using the circuitmux data
structure. It also runs the old (slow) algorithm and compares
the results of the two to make sure that they're the same.
Needs review and testing.
2014-03-14 11:57:51 -04:00
Nick Mathewson
df836b45b0
Merge remote-tracking branch 'asn/bug5018_notice'
2014-03-12 11:10:51 -04:00
Nick Mathewson
9077118ee2
Remove the unused router_hex_digest_matches
...
When I removed some unused functions in 5bfa373eee
, this became
unused as well.
2014-03-11 11:17:46 -04:00
Nick Mathewson
cce06b649e
Merge remote-tracking branch 'asn/bug11069_take2'
2014-03-11 11:04:47 -04:00
George Kadianakis
1c475eb018
Throw control port warning if we failed to connect to all our bridges.
2014-03-10 22:52:07 +00:00
George Kadianakis
cc1bb19d56
Tone down the log message for when we don't need a PT proxy.
2014-03-10 22:05:31 +00:00
Nick Mathewson
b8ceb464e5
Merge branch 'bug11156_squashed'
2014-03-10 14:08:38 -04:00
Nick Mathewson
0c04416c11
Merge branch 'bug11043_take2_squashed'
2014-03-10 14:08:29 -04:00
George Kadianakis
6606e676ee
Don't do directory fetches before all PTs have been configured.
2014-03-10 14:07:56 -04:00
George Kadianakis
8c8e21e296
Improve the log message for when the Extended ORPort is not enabled.
2014-03-10 12:54:46 -04:00
Nick Mathewson
a50690e68f
Merge remote-tracking branch 'origin/maint-0.2.4'
2014-03-06 11:52:22 -05:00
Nick Mathewson
4a2a1e572e
Merge branch 'bug11108'
2014-03-06 10:22:40 -05:00
Nick Mathewson
cbf9e74236
Correct the URL in the "a relay on win95???" message
...
This is a fix for 9393; it's not a bugfix on any Tor version per se,
but rather on whatever Tor version was current when we reorganized the
wiki.
2014-03-06 09:57:42 -05:00
Nick Mathewson
a4b447604a
Stop accepting 0.2.2 relay uploads for the consensus.
...
Resolves ticket 11149.
2014-03-06 09:38:35 -05:00
Nick Mathewson
663aba07e5
Fix whitespace errors, all of them mine.
2014-03-05 14:36:32 -05:00
Nick Mathewson
22ccfc6b5f
Rename PredictedCircsRelevanceTime->PredictedPortsRelevanceTime
...
All circuits are predictive; it's the ports that are expiring here.
2014-03-05 14:35:07 -05:00
Nick Mathewson
103cebd924
Merge branch 'ticket9176_squashed'
...
Conflicts:
doc/tor.1.txt
2014-03-05 14:32:05 -05:00
Nick Mathewson
25374d307d
Fix wide lines.
2014-03-05 14:31:13 -05:00
Nick Mathewson
2c25bb413e
Lower the maximum for PrecictedCircsRelevanceTime to one hour
2014-03-05 14:31:13 -05:00
unixninja92
4f03804b08
Fixed spacing.
2014-03-05 14:31:13 -05:00