fa1a419622
Merge branch 'maint-0.2.2'
2010-12-01 00:12:33 -05:00
b259c08318
Merge branch 'maint-0.2.1' into maint-0.2.2
...
Conflicts:
doc/Makefile.am
2010-12-01 00:11:27 -05:00
3ed7505dc5
Merge remote branch 'origin/maint-0.2.2'
...
Conflicts:
src/or/relay.c
2010-11-30 19:23:40 -05:00
ad87d6172b
fix changes file for 2210
2010-11-30 19:19:36 -05:00
25b0fd8868
Revise comment on 2210 a little; clean up n_streams/num_streams confusion
...
Also add a changes file
2010-11-29 16:07:27 -05:00
19019f26b0
Merge remote branch 'origin/maint-0.2.2'
2010-11-29 15:30:17 -05:00
a5174b092e
Merge branch 'exitstats' into maint-0.2.2
2010-11-29 15:28:22 -05:00
ae6b31aba9
Merge remote branch 'origin/maint-0.2.2'
...
Conflicts:
configure.in
contrib/tor-mingw.nsi.in
src/win32/orconfig.h
2010-11-24 17:06:26 -05:00
de75afc556
Avoid dereferencing NULL if a bridge fails to build an ei descriptor.
...
Reported by an anonymous commenter on Trac.
2010-11-24 13:18:11 -08:00
4fed43ab2e
Report only the top 10 ports in exit-port stats.
2010-11-24 08:45:05 +01:00
78df6404eb
Fix compilation with mingw and OpenSSL 0.9.8m+
2010-11-23 12:47:38 -05:00
2d6ee53fb9
stop shipping doc/img and doc/website in the tarball
2010-11-23 00:03:50 -05:00
f54e75a2c6
prepare for our emergency openssl fix release
2010-11-21 16:59:42 -05:00
cbd3745924
Merge remote branch 'origin/maint-0.2.2'
2010-11-21 14:34:22 -05:00
2bd64f9e8f
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
2010-11-21 14:33:11 -05:00
a9d2148f53
Merge branch 'fix2204' into maint-0.2.1
2010-11-21 14:28:38 -05:00
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
e361de80bb
Merge remote branch 'origin/maint-0.2.2'
...
Conflicts:
src/or/router.c
2010-11-19 16:58:22 -05:00
54551f3148
Merge branch 'fix2183', remote branch 'rransom/fix2195-v2' into maint-0.2.2
2010-11-19 16:48:13 -05:00
b3470ce957
Add changes file for bug2195.
2010-11-19 13:46:09 -08:00
576b399b19
Add a changes file for SIGNAL events
2010-11-19 15:54:02 -05:00
6b82a6e88d
Merge branch 'maint-0.2.2'
2010-11-16 00:16:25 -05:00
e0b922b7e6
merge in more changelog entries
2010-11-15 23:54:20 -05:00
a641646a98
Merge commit 'nickm/1776_redux_v1' into maint-0.2.2
2010-11-15 23:29:09 -05:00
9399b885cd
Merge remote branch 'origin/maint-0.2.2'
...
Conflicts:
src/or/buffers.c
2010-11-15 15:37:23 -05:00
522c204ac9
Merge branch 'bug2000_nm_022' into maint-0.2.2
2010-11-15 15:31:40 -05:00
ba1b7a1ce1
Merge remote branch 'origin/maint-0.2.2'
2010-11-15 14:30:12 -05:00
29c468146d
changes entry for nopublish removal in 5040c855d
2010-11-15 14:29:53 -05:00
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
433a98131a
Merge remote branch 'sebastian/manpagefixups' into maint-0.2.2
2010-11-15 14:07:00 -05:00
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
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
3d7772ece3
Merge remote branch 'karsten/enhancement1883'
2010-11-12 14:13:17 -05:00
d61736aa6a
Merge remote branch 'origin/maint-0.2.2'
2010-11-12 13:06:54 -05:00
3a7614c670
Add changes file for bug1125
2010-11-12 13:03:18 -05:00
566a115be1
Add changes file for bug1125
2010-11-12 12:59:42 -05:00
edec2797d7
Stop linking src/tools/* against libevent
2010-11-11 23:50:33 -05:00
2b4ed1d07e
Merge remote branch 'origin/maint-0.2.2'
...
Conflicts:
configure.in
2010-11-11 13:59:18 -05:00
5beb8ee4e1
Merge remote branch 'sebastian/remove-osx-expert-package' into maint-0.2.2
2010-11-11 13:53:53 -05:00
a29596556c
Merge branch 'maint-0.2.2'
...
Conflicts:
src/or/config.c
2010-11-11 12:19:37 -05:00
362bb5c625
Merge branch 'maint-0.2.1' into maint-0.2.2
2010-11-11 12:12:17 -05:00
0a38358210
let unpublished bridges learn their ip address too
2010-11-11 11:26:42 -05:00
d4e660ff68
Merge remote branch 'origin/maint-0.2.2'
2010-11-10 16:07:04 -05:00
a4bf5b51e9
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
2010-11-10 16:06:43 -05:00
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
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
6bde512edc
Document hs dht min uptime change in privnets
...
In f87c6f100d
2010-11-10 15:48:26 +01:00
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
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
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
Nick Mathewson
Robert Ransom
Karsten Loesing
mingw-san
Sebastian Hahn