Nick Mathewson
3b6c48328b
Or maybe it is 2013. Who can say?
2013-10-09 12:48:18 -04:00
Nick Mathewson
bcde4cc4cf
Merge remote-tracking branch 'karsten/task-9854-2'
2013-10-09 12:36:24 -04:00
Nick Mathewson
0e3cf3ebf8
Merge remote-tracking branch 'origin/maint-0.2.4'
...
Use "ours" strategy to avoid taking 73a0bb16b9
2013-10-09 12:07:01 -04:00
Nick Mathewson
73a0bb16b9
Partially revert "Clarify who learns about ContactInfo."
...
This reverts the torrc.sample.in changes from commit
66a04a6ac3
2013-10-09 12:02:53 -04:00
Karsten Loesing
795c0f7b00
Update last modified timestamp of torrc.sample.in.
2013-10-09 17:41:05 +02:00
Nick Mathewson
882fb8383d
Merge remote-tracking branch 'origin/maint-0.2.4'
2013-10-09 09:45:21 -04:00
Nick Mathewson
270dcc9131
Changes file for 9854
2013-10-09 09:43:54 -04:00
Karsten Loesing
66a04a6ac3
Clarify who learns about ContactInfo.
...
Explicitly include bridges, and note that we archive and publish all
descriptors.
(We are not yet publishing ContactInfo lines contained in bridge
descriptors, but maybe we'll want to do that soon, so let's err on the
side of caution here.)
Related to #9854 .
2013-10-09 09:43:18 -04:00
Nick Mathewson
9de456a303
Merge remote-tracking branch 'origin/maint-0.2.4'
2013-10-08 16:47:49 -04:00
Nick Mathewson
b8abadedd3
When examining interfaces to find an address, discard non-up ones.
...
Patch from "hantwister" on trac. Fixes bug #9904 ; bugfix on
0.2.3.11-alpha.
2013-10-08 16:46:29 -04:00
Nick Mathewson
30b8fc3e0d
Merge remote-tracking branch 'origin/maint-0.2.4'
...
Using "ours" strategy since we already merged the equivalent of #9866
into this branch.
2013-10-08 16:09:45 -04:00
Nick Mathewson
fa1034cd99
Changes file for 9866
2013-10-08 16:06:36 -04:00
Peter Palfrader
2c270136a4
Anchors for options (re#9866)
2013-10-08 16:06:19 -04:00
Nick Mathewson
66624ded39
Merge remote-tracking branch 'origin/maint-0.2.4'
...
Conflicts:
src/or/relay.c
2013-10-08 13:38:47 -04:00
Nick Mathewson
50fc8fb5c5
Merge remote-tracking branch 'public/bug9927' into maint-0.2.4
2013-10-08 13:37:13 -04:00
Nick Mathewson
b571b966f2
Tweak a comment
2013-10-08 12:18:31 -04:00
Nick Mathewson
1060688d2a
Merge remote-tracking branch 'origin/maint-0.2.4'
2013-10-08 12:17:14 -04:00
Nick Mathewson
7e0f1fa52a
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
2013-10-08 12:16:42 -04:00
Nick Mathewson
5e0404265f
Merge remote-tracking branch 'origin/maint-0.2.4'
2013-10-08 12:11:37 -04:00
Nick Mathewson
0c3c47565d
Merge remote-tracking branch 'public/bug9596' into maint-0.2.4
2013-10-08 12:10:47 -04:00
Nick Mathewson
63234b1839
Merge branch 'bug9922'
2013-10-08 12:03:09 -04:00
Nick Mathewson
b2a050cb2a
Finish changelog message for 9922.
2013-10-08 12:02:34 -04:00
Roger Dingledine
5f13ae4b03
don't lie about bootstrap progress when clients use bridges
...
we were listing 50% as soon as we got a bridge's relay descriptor,
even if we didn't have any consensus, certificates, etc yet.
2013-10-08 11:50:53 -04:00
Nick Mathewson
c8c2298015
Simply route length generation code.
...
The old code had logic to use a shorter path length if we didn't
have enough nodes. But we don't support 2-node networks anwyay.
Fix for #9926 . I'm not calling this a bugfix on any particular
version, since a 2-node network would fail to work for you for a lot
of other reasons too, and it's not clear to me when that began, or if
2-node networks would ever have worked.
2013-10-08 11:48:33 -04:00
Nick Mathewson
c7c24785ee
Generate bootstrapping status messages for microdescs too
...
Fix for 9927.
2013-10-08 11:32:02 -04:00
Nick Mathewson
245ecfff36
Changes file for 9866
2013-10-07 11:32:06 -04:00
Peter Palfrader
4e37eba0ac
Anchors for options (re#9866)
2013-10-07 11:31:01 -04:00
Nick Mathewson
a6b4934037
Bump version to 0.2.5.1-alpha-dev
2013-10-02 22:41:41 -04:00
Nick Mathewson
566645b5ed
Merge remote-tracking branch 'origin/maint-0.2.4'
2013-10-02 22:40:01 -04:00
Nick Mathewson
0bec65277a
Merge branch 'bug9880_fix' into maint-0.2.4
2013-10-02 22:39:27 -04:00
Nick Mathewson
557f332957
Fix a bug in our bug 9776 fix.
...
By calling circuit_n_chan_done() unconditionally on close, we were
closing pending connections that might not have been pending quite for
the connection we were closing. Fix for bug 9880.
Thanks to skruffy for finding this and explaining it patiently until
we understood.
2013-10-02 22:20:18 -04:00
Roger Dingledine
e65b54ec75
one last teeny-tiny change
2013-10-01 22:54:25 -04:00
Roger Dingledine
513a118d38
give it a release blurb
2013-10-01 22:32:35 -04:00
Roger Dingledine
fdf9fc5a7f
bump to 0.2.5.1-alpha
2013-10-01 20:57:30 -04:00
Roger Dingledine
f4c6d4a3d6
0.2.5.1-alpha will come out before 0.2.4.18-rc, so get its changes too
2013-10-01 20:49:15 -04:00
Roger Dingledine
299e8c0292
first draft of an 0.2.5.1-alpha changelog
2013-10-01 20:41:46 -04:00
Roger Dingledine
bce775c159
name it correctly, maybe
2013-10-01 15:47:38 -04:00
Roger Dingledine
4e610f721b
blow away three more changes files that got into 0.2.4
2013-10-01 15:10:13 -04:00
Nick Mathewson
e62e8a31bd
Add torify to EXTRA_DIST
...
Now that we no longer build it from torify.in, we need to list it
manually.
2013-10-01 13:03:33 -04:00
Nick Mathewson
5baacf5a9c
Mention "make test-network" in doc/HACKING
2013-10-01 12:50:48 -04:00
Roger Dingledine
a980d844cd
what is logging "above" notice?
2013-10-01 08:55:57 -04:00
Roger Dingledine
b484711a51
remove changes files that are already merged in release-0.2.4
2013-10-01 07:35:48 -04:00
Roger Dingledine
0d8632e585
fix another confusing whitespace instance
2013-09-30 01:47:24 -04:00
Roger Dingledine
2cf41cc70d
fix confusing whitespace
2013-09-30 01:41:48 -04:00
Jim Pannacciulli
8bc5b9f3d0
test-network.sh: tools dir in PATH, parameterization
2013-09-29 14:19:00 -04:00
Nick Mathewson
09e850dc36
Changes file for 5505
2013-09-29 13:59:17 -04:00
guilhem
f8c45339f7
Don't preprocess torify
...
Since torify has been removed from tsocks, it doesn't need to be
preprocessed. Closes #5505 .
2013-09-29 13:59:17 -04:00
Roger Dingledine
1b6ea92a57
fix whitespace in log message
2013-09-29 06:15:00 -04:00
Roger Dingledine
c902b4981b
fix two cases where we were printing unsigned int as %d
2013-09-29 06:13:59 -04:00
Roger Dingledine
36ed5aa1c6
retroactively fix a typo
2013-09-26 21:21:03 -04:00
