71bd100976
DROPGUARDS controller command
...
Implements ticket 9934; patch from "ra"
2013-10-21 13:02:25 -04:00
17d368281a
Merge remote-tracking branch 'linus/bug9206_option'
2013-10-16 11:20:43 -04:00
1129362bd7
changes file for bug9651
2013-10-14 11:44:20 -04:00
7f2415683a
Merge remote-tracking branch 'asn/bug9651'
2013-10-14 11:43:33 -04:00
a26a5794a3
Merge branch 'maint-0.2.4'
2013-10-12 10:48:30 -04:00
8f9fb63cdb
be willing to bootstrap from all three of our directory guards
...
Also fix a bug where if the guard we choose first doesn't answer, we
would try the second guard, but once we connected to the second guard
we would abandon it and retry the first one, slowing down bootstrapping.
The fix in both cases is to treat all our initially chosen guards as
acceptable to use.
Fixes bug 9946.
2013-10-12 10:42:27 -04:00
d5f050111e
Fix out-of-tree "make check-local"
2013-10-11 13:42:27 -04:00
f308adf838
When possible, run the ntor python integration tests too
2013-10-11 13:21:42 -04:00
187398318e
When python is available, run the commandline unit tests from "make check"
2013-10-11 13:07:14 -04:00
0546edde66
Merge branch 'bug1376'
2013-10-11 12:51:15 -04:00
7ef9ecf6b3
Fix some whitespace; tighten the tests.
2013-10-11 12:51:07 -04:00
6f9584b3fd
Make --version, --help, etc incremement quiet level, never decrease it
...
Fixes other case of #9578
2013-10-11 12:32:59 -04:00
3e3b9219ec
Merge remote-tracking branch 'karsten/geoip-manual-update-oct2013'
2013-10-11 11:17:25 -04:00
64293135df
Merge remote-tracking branch 'origin/maint-0.2.4'
2013-10-11 11:17:18 -04:00
7ef2939e5a
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
2013-10-11 11:16:59 -04:00
82d8944928
Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3
2013-10-11 11:16:45 -04:00
3b0265198f
Update to the October 2013 GeoIP database.
2013-10-11 13:36:30 +02:00
f4ef7c76f3
Modify 1 and delete 1 geoip A1 substitution.
2013-10-11 13:30:39 +02:00
f96a8d5fa3
Report bootstrapping progress correctly when downloading microdescs
...
We had updated our "do we have enough microdescs to begin building
circuits?" logic most recently in 0.2.4.10-alpha (see bug 5956), but we
left the bootstrap status event logic at "how far through getting 1/4
of them are we?"
Fixes bug 9958; bugfix on 0.2.2.36, which is where they diverged (see
bug 5343).
2013-10-10 21:39:21 -04:00
78251e004f
Merge branch 'maint-0.2.4'
2013-10-10 21:25:01 -04:00
eb5d75e96a
rewrite history to improve two changelog entries
2013-10-10 21:17:19 -04:00
43f95e38ab
Merge remote-tracking branch 'sysrqb/bug9950'
2013-10-10 11:27:28 -04:00
df4693fed5
Merge remote-tracking branch 'origin/maint-0.2.4'
2013-10-10 11:24:16 -04:00
2c7ed0406f
Merge branch 'bug9644_024' into maint-0.2.4
2013-10-10 11:23:46 -04:00
3d817fa29c
Merge remote-tracking branch 'origin/maint-0.2.4'
2013-10-10 11:18:17 -04:00
7b1b8c3694
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
2013-10-10 11:18:07 -04:00
004a9c6dd1
Fix unit test for format_helper_exit_status
...
Fix format_helper_exit_status to allow full HEX_ERRNO_SIZE answers,
*and* increase the buffer length again.
2013-10-10 11:15:35 -04:00
97285bc465
Merge remote-tracking branch 'origin/maint-0.2.4'
2013-10-10 10:55:58 -04:00
1137817319
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
2013-10-10 10:55:24 -04:00
6eb7f2f889
Merge remote-tracking branch 'public/bug9928' into maint-0.2.3
2013-10-10 10:53:27 -04:00
528e3bf892
Free the smartlist after parsing csv config option
...
Bugfix on 1293835440
2013-10-09 23:16:57 +00:00
3b6c48328b
Or maybe it is 2013. Who can say?
2013-10-09 12:48:18 -04:00
bcde4cc4cf
Merge remote-tracking branch 'karsten/task-9854-2'
2013-10-09 12:36:24 -04:00
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
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
795c0f7b00
Update last modified timestamp of torrc.sample.in.
2013-10-09 17:41:05 +02:00
882fb8383d
Merge remote-tracking branch 'origin/maint-0.2.4'
2013-10-09 09:45:21 -04:00
270dcc9131
Changes file for 9854
2013-10-09 09:43:54 -04:00
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
9de456a303
Merge remote-tracking branch 'origin/maint-0.2.4'
2013-10-08 16:47:49 -04:00
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
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
fa1034cd99
Changes file for 9866
2013-10-08 16:06:36 -04:00
2c270136a4
Anchors for options (re#9866)
2013-10-08 16:06:19 -04:00
66624ded39
Merge remote-tracking branch 'origin/maint-0.2.4'
...
Conflicts:
src/or/relay.c
2013-10-08 13:38:47 -04:00
50fc8fb5c5
Merge remote-tracking branch 'public/bug9927' into maint-0.2.4
2013-10-08 13:37:13 -04:00
b571b966f2
Tweak a comment
2013-10-08 12:18:31 -04:00
1060688d2a
Merge remote-tracking branch 'origin/maint-0.2.4'
2013-10-08 12:17:14 -04:00
7e0f1fa52a
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
2013-10-08 12:16:42 -04:00
5e0404265f
Merge remote-tracking branch 'origin/maint-0.2.4'
2013-10-08 12:11:37 -04:00
Nick Mathewson
Roger Dingledine
Karsten Loesing
Matthew Finkel
Peter Palfrader