 Nick Mathewson
|
17d368281a
Merge remote-tracking branch 'linus/bug9206_option'
|
11 gadi atpakaļ |
|
Nick Mathewson
|
1129362bd7
changes file for bug9651
|
11 gadi atpakaļ |
|
Nick Mathewson
|
7f2415683a
Merge remote-tracking branch 'asn/bug9651'
|
11 gadi atpakaļ |
 Roger Dingledine
|
a26a5794a3
Merge branch 'maint-0.2.4'
|
11 gadi atpakaļ |
|
Roger Dingledine
|
8f9fb63cdb
be willing to bootstrap from all three of our directory guards
|
11 gadi atpakaļ |
|
Nick Mathewson
|
d5f050111e
Fix out-of-tree "make check-local"
|
11 gadi atpakaļ |
|
Nick Mathewson
|
f308adf838
When possible, run the ntor python integration tests too
|
11 gadi atpakaļ |
|
Nick Mathewson
|
187398318e
When python is available, run the commandline unit tests from "make check"
|
11 gadi atpakaļ |
|
Nick Mathewson
|
0546edde66
Merge branch 'bug1376'
|
11 gadi atpakaļ |
|
Nick Mathewson
|
7ef9ecf6b3
Fix some whitespace; tighten the tests.
|
11 gadi atpakaļ |
|
Nick Mathewson
|
6f9584b3fd
Make --version, --help, etc incremement quiet level, never decrease it
|
11 gadi atpakaļ |
|
Nick Mathewson
|
3e3b9219ec
Merge remote-tracking branch 'karsten/geoip-manual-update-oct2013'
|
11 gadi atpakaļ |
|
Nick Mathewson
|
64293135df
Merge remote-tracking branch 'origin/maint-0.2.4'
|
11 gadi atpakaļ |
|
Nick Mathewson
|
7ef2939e5a
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
|
11 gadi atpakaļ |
|
Nick Mathewson
|
82d8944928
Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3
|
11 gadi atpakaļ |
 Karsten Loesing
|
3b0265198f
Update to the October 2013 GeoIP database.
|
11 gadi atpakaļ |
|
Karsten Loesing
|
f4ef7c76f3
Modify 1 and delete 1 geoip A1 substitution.
|
11 gadi atpakaļ |
|
Roger Dingledine
|
f96a8d5fa3
Report bootstrapping progress correctly when downloading microdescs
|
11 gadi atpakaļ |
|
Roger Dingledine
|
78251e004f
Merge branch 'maint-0.2.4'
|
11 gadi atpakaļ |
|
Roger Dingledine
|
eb5d75e96a
rewrite history to improve two changelog entries
|
11 gadi atpakaļ |
|
Nick Mathewson
|
43f95e38ab
Merge remote-tracking branch 'sysrqb/bug9950'
|
11 gadi atpakaļ |
|
Nick Mathewson
|
df4693fed5
Merge remote-tracking branch 'origin/maint-0.2.4'
|
11 gadi atpakaļ |
|
Nick Mathewson
|
2c7ed0406f
Merge branch 'bug9644_024' into maint-0.2.4
|
11 gadi atpakaļ |
|
Nick Mathewson
|
3d817fa29c
Merge remote-tracking branch 'origin/maint-0.2.4'
|
11 gadi atpakaļ |
|
Nick Mathewson
|
7b1b8c3694
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
|
11 gadi atpakaļ |
|
Nick Mathewson
|
004a9c6dd1
Fix unit test for format_helper_exit_status
|
11 gadi atpakaļ |
|
Nick Mathewson
|
97285bc465
Merge remote-tracking branch 'origin/maint-0.2.4'
|
11 gadi atpakaļ |
|
Nick Mathewson
|
1137817319
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
|
11 gadi atpakaļ |
|
Nick Mathewson
|
6eb7f2f889
Merge remote-tracking branch 'public/bug9928' into maint-0.2.3
|
11 gadi atpakaļ |
 Matthew Finkel
|
528e3bf892
Free the smartlist after parsing csv config option
|
11 gadi atpakaļ |
