Robert Ransom
ca6efcf507
Make handle_control_setevents table-driven
2011-06-25 17:45:33 -07:00
Robert Ransom
c780bc4d0b
Merge branch 'bug3465-022' into bug3465-023
...
* bug3465-022:
Add BUILDTIMEOUT_SET to the result of GETINFO events/names
Correct a comment
Fix minor comment issues
2011-06-25 15:04:07 -07:00
Robert Ransom
93d52f6739
Add BUILDTIMEOUT_SET to the result of GETINFO events/names
2011-06-25 15:02:11 -07:00
Robert Ransom
53f87a89f0
Correct a comment
2011-06-24 15:18:22 -07:00
Nick Mathewson
0b536469ee
Merge remote-tracking branch 'rransom-tor/bug3456'
2011-06-24 16:48:38 -04:00
Nick Mathewson
4bbd6a2761
Merge branch 'master' of ssh://git-rw.torproject.org/tor
2011-06-24 16:48:01 -04:00
Robert Ransom
76d0d62bd9
Correct terminology in comment
2011-06-24 11:28:52 -07:00
Robert Ransom
58f801fadf
Store cpath_build_state_t flags in one-bit bitfields, not ints
2011-06-24 11:28:15 -07:00
Roger Dingledine
694cd7ade9
reach back in time and name a config option correctly
2011-06-23 23:54:34 -04:00
Robert Ransom
cb1b20dbad
Fix minor comment issues
2011-06-23 15:46:15 -07:00
Nick Mathewson
9919b01275
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-06-22 18:15:27 -04:00
George Kadianakis
1fe8bee656
Revised how we handle ClientTransportPlugin and Bridge lines.
...
Multiple Bridge lines can point to the same one ClientTransportPlugin
line, and we can have multiple ClientTransportPlugin lines in our
configuration file that don't match with a bridge. We also issue a
warning when we have a Bridge line with a pluggable transport but we
can't match it to a ClientTransportPlugin line.
2011-06-22 23:28:11 +02:00
Robert Ransom
2b5ebc7097
Improve documentation of smartlist_split_string
2011-06-22 14:09:43 -07:00
Robert Ransom
d7254bea11
Fix minor comment issues
2011-06-22 14:09:43 -07:00
Robert Ransom
8a55da57ed
Fix comment typo
2011-06-22 13:42:28 -07:00
George Kadianakis
5a05deb574
Various small tweaks around config.c and or.h
2011-06-21 18:49:04 +02:00
George Kadianakis
298f170036
Tweaked connection{.c,.h,_or.c} based on nick's comments.
...
* Tweaked doxygen comments.
* Changed returns of get_proxy_addrport().
* Ran make check-spaces.
* Various small code tweaks.
2011-06-21 18:48:43 +02:00
George Kadianakis
392e947df5
Fixes on circuitbuild.[ch] based on nick's comments.
...
* Renamed transport_info_t to transport_t.
* Introduced transport_get_by_name().
* Killed match_bridges_with_transports().
We currently *don't* detect whether any bridges miss their transports,
of if any transports miss their bridges.
* Various code and aesthetic tweaks and English language changes.
2011-06-21 18:46:50 +02:00
Nick Mathewson
64a5a4177f
Merge branch 'bug3367'
2011-06-21 11:32:52 -04:00
Nick Mathewson
4186b1362b
Merge remote-tracking branch 'public/bug3264'
2011-06-21 10:28:25 -04:00
Nick Mathewson
e617a34d58
Add, use a bufferevent-safe connection_flush()
...
A couple of places in control.c were using connection_handle_write()
to flush important stuff (the response to a SIGNAL command, an
ERR-level status event) before Tor went down. But
connection_handle_write() isn't meaningful for bufferevents, so we'd
crash.
This patch adds a new connection_flush() that works for all connection
backends, and makes control.c use that instead.
Fix for bug 3367; bugfix on 0.2.3.1-alpha.
2011-06-21 10:22:54 -04:00
Roger Dingledine
37ff37a890
forward-port the 0.2.2.29-beta changelog entry
2011-06-21 01:18:58 -04:00
Roger Dingledine
b181985a8f
explain that the ./publish should happen soon after the scp
...
otherwise you scp a tarball up but only one version of the website has it.
2011-06-21 00:37:18 -04:00
Jacob Appelbaum
8b0d9452ca
Fix tor-fw-helper-natpmp.c API usage
...
libnatpmp-20110618 changed the API that tor-fw-helper used and for a time
tor-fw-helper could not build against the newest libnatpmp. This patch brings
support for libnatpmp to tor-fw-helper.
2011-06-20 20:01:46 -04:00
Nick Mathewson
410e440a8d
Log SSL state changes at LOG_DEBUG, LD_HANDSHAKE.
...
This can be slightly useful for debugging blocking events.
Addresses ticket 3116; based on loud_ssl_states branch.
2011-06-20 17:45:12 -04:00
Nick Mathewson
8653f31d8d
Fix overwide line in config.c
2011-06-20 15:29:22 -04:00
Nick Mathewson
997499369e
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-06-20 15:28:16 -04:00
Nick Mathewson
1040ccafb2
Fix overwide lines in util.c
2011-06-20 15:28:06 -04:00
intrigeri
8b265543eb
Add port 6523 (Gobby) to LongLivedPorts.
2011-06-20 12:08:46 -04:00
Nick Mathewson
a046966baf
Merge remote-tracking branch 'origin/maint-0.2.2'
...
Conflicts:
src/or/config.c
src/or/or.h
2011-06-19 21:00:15 -04:00
Nick Mathewson
8e5dfe42a0
Tweak bug2355_revert at suggestion from Roger
2011-06-19 20:58:46 -04:00
Robert Ransom
eeedc5c13c
Put hashes of all tor source files into or_sha1.i
2011-06-18 00:54:04 -07:00
Nick Mathewson
1811bef666
Add changes file for bug2355 revert
2011-06-17 16:54:31 -04:00
Nick Mathewson
3b41551b61
Revert "Add an "auto" option to UseBridges"
...
This reverts commit 507c1257a4
2011-06-17 16:45:53 -04:00
Nick Mathewson
cabb16caa9
Revert "Update man page for new UseBridges tristate behaviour."
...
This reverts commit 40cfad1b5a
2011-06-17 16:45:23 -04:00
Nick Mathewson
42d6f34590
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-06-17 15:25:18 -04:00
Nick Mathewson
85d4c290d7
Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2
2011-06-17 15:24:23 -04:00
Robert Ransom
010b8dd4f6
Abandon rendezvous circuits on SIGNAL NEWNYM
2011-06-17 15:22:23 -04:00
Nick Mathewson
31b9b1a5bb
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-06-17 15:04:29 -04:00
Nick Mathewson
209229f100
Merge branch 'bug3407' into maint-0.2.2
2011-06-17 14:59:39 -04:00
Robert Ransom
227896e447
Make send_control_event_impl's behaviour sane
2011-06-17 13:57:25 -04:00
Robert Ransom
70785f87bb
Fix comment typo
2011-06-17 13:57:25 -04:00
Robert Ransom
68cd0a9abe
Make connection_printf_to_buf's behaviour sane
2011-06-17 13:57:25 -04:00
Roger Dingledine
64bfbcb918
log when we finish ssl handshake and move to renegotiation
...
debug-level since it will be quite common. logged at both client
and server side. this step should help us track what's going on
with people filtering tor connections by our ssl habits.
2011-06-17 03:31:59 -04:00
Nick Mathewson
a857f61e27
Merge remote-tracking branch 'rransom-tor/bug3332-v2'
2011-06-15 11:33:40 -04:00
Robert Ransom
44eafa9697
Assert that HS operations are not performed using single-hop circuits
...
(with fixes by Nick Mathewson to unbreak the build)
2011-06-14 21:32:49 -07:00
Nick Mathewson
875a551409
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-06-14 13:46:46 -04:00
Nick Mathewson
a25c0a5bf8
Merge remote-tracking branch 'public/bug3369' into maint-0.2.2
2011-06-14 13:46:10 -04:00
Nick Mathewson
e70e8367c9
Add changes file for bug3393
2011-06-14 13:45:12 -04:00
Nick Mathewson
19febed9e5
Merge remote-tracking branch 'rransom-tor/bug3349'
2011-06-14 13:39:26 -04:00
