Nick Mathewson
cbd3745924
Merge remote branch 'origin/maint-0.2.2'
2010-11-21 14:34:22 -05:00
Nick Mathewson
2bd64f9e8f
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
2010-11-21 14:33:11 -05:00
Nick Mathewson
a9d2148f53
Merge branch 'fix2204' into maint-0.2.1
2010-11-21 14:28:38 -05:00
Nick Mathewson
92a99736fd
Do not set the hostname TLS extension server-side; only client-side
...
This may fix bug 2204, and resolve the incompatibility with openssl
0.9.8p/1.0.0b.
2010-11-20 22:21:50 -05:00
Nick Mathewson
e361de80bb
Merge remote branch 'origin/maint-0.2.2'
...
Conflicts:
src/or/router.c
2010-11-19 16:58:22 -05:00
Nick Mathewson
54551f3148
Merge branch 'fix2183', remote branch 'rransom/fix2195-v2' into maint-0.2.2
2010-11-19 16:48:13 -05:00
Robert Ransom
b3470ce957
Add changes file for bug2195.
2010-11-19 13:46:09 -08:00
Nick Mathewson
576b399b19
Add a changes file for SIGNAL events
2010-11-19 15:54:02 -05:00
Roger Dingledine
6b82a6e88d
Merge branch 'maint-0.2.2'
2010-11-16 00:16:25 -05:00
Roger Dingledine
e0b922b7e6
merge in more changelog entries
2010-11-15 23:54:20 -05:00
Roger Dingledine
a641646a98
Merge commit 'nickm/1776_redux_v1' into maint-0.2.2
2010-11-15 23:29:09 -05:00
Nick Mathewson
9399b885cd
Merge remote branch 'origin/maint-0.2.2'
...
Conflicts:
src/or/buffers.c
2010-11-15 15:37:23 -05:00
Nick Mathewson
522c204ac9
Merge branch 'bug2000_nm_022' into maint-0.2.2
2010-11-15 15:31:40 -05:00
Nick Mathewson
ba1b7a1ce1
Merge remote branch 'origin/maint-0.2.2'
2010-11-15 14:30:12 -05:00
Nick Mathewson
29c468146d
changes entry for nopublish removal in 5040c855d
2010-11-15 14:29:53 -05:00
Nick Mathewson
8c2affe637
Merge remote branch 'origin/maint-0.2.2'
...
Conflicts:
src/or/config.c
src/or/cpuworker.c
2010-11-15 14:14:13 -05:00
Nick Mathewson
433a98131a
Merge remote branch 'sebastian/manpagefixups' into maint-0.2.2
2010-11-15 14:07:00 -05:00
Sebastian Hahn
da3a6e724f
Rate-limit unsafe socks warning
...
Pick 5 seconds as the limit. 5 seconds is a compromise here between
making sure the user notices that the bad behaviour is (still) happening
and not spamming their log too much needlessly (the log message is
pretty long). We also keep warning every time if safesocks is
specified, because then the user presumably wants to hear about every
blocked instance.
(This is based on the original patch by Sebastian, then backported to
0.2.2 and with warnings split into their own function.)
2010-11-15 13:57:37 -05:00
Karsten Loesing
cec21652a7
Try harder not to exceed the 50 KB extra-info descriptor limit.
...
Our checks that we don't exceed the 50 KB size limit of extra-info
descriptors apparently failed. This patch fixes these checks and reserves
another 250 bytes for appending the signature. Fixes bug 2183.
2010-11-15 12:51:51 +01:00
Nick Mathewson
3d7772ece3
Merge remote branch 'karsten/enhancement1883'
2010-11-12 14:13:17 -05:00
Nick Mathewson
d61736aa6a
Merge remote branch 'origin/maint-0.2.2'
2010-11-12 13:06:54 -05:00
Nick Mathewson
3a7614c670
Add changes file for bug1125
2010-11-12 13:03:18 -05:00
Nick Mathewson
566a115be1
Add changes file for bug1125
2010-11-12 12:59:42 -05:00
Nick Mathewson
edec2797d7
Stop linking src/tools/* against libevent
2010-11-11 23:50:33 -05:00
Nick Mathewson
2b4ed1d07e
Merge remote branch 'origin/maint-0.2.2'
...
Conflicts:
configure.in
2010-11-11 13:59:18 -05:00
Nick Mathewson
5beb8ee4e1
Merge remote branch 'sebastian/remove-osx-expert-package' into maint-0.2.2
2010-11-11 13:53:53 -05:00
Roger Dingledine
a29596556c
Merge branch 'maint-0.2.2'
...
Conflicts:
src/or/config.c
2010-11-11 12:19:37 -05:00
Roger Dingledine
362bb5c625
Merge branch 'maint-0.2.1' into maint-0.2.2
2010-11-11 12:12:17 -05:00
Roger Dingledine
0a38358210
let unpublished bridges learn their ip address too
2010-11-11 11:26:42 -05:00
Nick Mathewson
d4e660ff68
Merge remote branch 'origin/maint-0.2.2'
2010-11-10 16:07:04 -05:00
Nick Mathewson
a4bf5b51e9
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
2010-11-10 16:06:43 -05:00
Nick Mathewson
2a50dd9359
Enforce multiplicity rules when parsing annotations.
...
We would never actually enforce multiplicity rules when parsing
annotations, since the counts array never got entries added to it for
annotations in the token list that got added by earlier calls to
tokenize_string.
Found by piebeer.
2010-11-10 16:02:02 -05:00
Nick Mathewson
089137f011
Fix a bug where seting allow_annotations==0 only ignores annotations, but does not block them
2010-11-10 16:02:02 -05:00
Sebastian Hahn
6bde512edc
Document hs dht min uptime change in privnets
...
In f87c6f100d
2010-11-10 15:48:26 +01:00
Sebastian Hahn
b9cac605ab
Synx manpage and source wrt option capitalization
...
We had a spelling discrepancy between the manpage and the source code
for some option. Resolve these in favor of the manpage, because it
makes more sense (for example, HTTP should be capitalized).
2010-11-10 15:48:26 +01:00
Sebastian Hahn
40fd0c1ca1
Remove the torrc.complete file.
...
We haven't been keeping it up to date, and the manpage exists as a
replacement for users who want an overview of all available options.
2010-11-10 15:48:25 +01:00
Sebastian Hahn
fcdf1470c0
Remove everything related to os x expert package
...
We decided to no longer ship expert packages for OS X because they're a
lot of trouble to keep maintained and confuse users. For those who want
a tor on OS X without Vidalia, macports is a fine option. Alternatively,
building from source is easy, too.
The polipo stuff that is still required for the Vidalia bundle build can
now be found in the torbrowser repository,
git://git.torproject.org/torbrowser.git.
2010-11-10 04:04:29 +01:00
Roger Dingledine
28d592267e
Merge branch 'maint-0.2.2'
2010-11-09 21:51:08 -05:00
Roger Dingledine
6b4db953c9
fold the changes files into a changelog
2010-11-09 21:50:30 -05:00
Karsten Loesing
423c2a7a27
Add GeoIP file digest to extra-info descriptor.
2010-11-09 09:42:36 +01:00
Nick Mathewson
1fb342dfab
Merge branch 'loggranularity'
2010-11-08 12:40:33 -05:00
Roger Dingledine
d96c9cd00e
Merge branch 'maint-0.2.2'
2010-11-06 17:42:37 -04:00
Roger Dingledine
70411a50b1
move to the november 1 maxmind geoip db
2010-11-06 17:41:36 -04:00
Nick Mathewson
114a371c0e
Fix the assert in bug 1776
...
In the case where old_router == NULL but sdmap has an entry for the
router, we can currently safely infer that the old_router was not a
bridge. Add an assert to ensure that this remains true, and fix the
logic not to die with the tor_assert(old_router) call.
2010-11-02 11:20:09 -04:00
Nick Mathewson
f32140238f
Merge remote branch 'origin/maint-0.2.2' for bug 1859 patches
...
Some of this is already done in nodelist.
2010-10-21 11:17:34 -04:00
Nick Mathewson
0e8d1c2217
Merge remote branch 'hoganrobert/bug1859' into maint-0.2.2
2010-10-21 11:01:12 -04:00
Nick Mathewson
2c3dafc342
Merge remote branch 'origin/maint-0.2.2'
2010-10-21 10:52:12 -04:00
Nick Mathewson
ea7f4be6d2
Merge remote branch 'sebastian/relay_early_rend' into maint-0.2.2
2010-10-21 10:49:44 -04:00
Nick Mathewson
444193ff5d
Merge remote branch 'origin/maint-0.2.2'
...
Conflicts:
src/or/networkstatus.c
2010-10-20 13:53:11 -04:00
Nick Mathewson
2849a95691
Add a ! to directory_caches_dir_info() to fix a logic error
...
We want to fetch directory info more aggressively if we need it to
refuseunknownexits. Thus, we'll want it if our exit policy is _NOT_
reject *.
2010-10-20 13:49:38 -04:00
