diff options
| author | Peter Palfrader <peter@palfrader.org> | 2009-09-03 15:19:37 +0200 |
|---|---|---|
| committer | Peter Palfrader <peter@palfrader.org> | 2009-09-03 15:19:37 +0200 |
| commit | b440a4d9369c4a6c4501b289f2e6ff089ba9a519 (patch) | |
| tree | 180932fa558b2fab3d984b0d64210bf8d1207179 /src/win32/orconfig.h | |
| parent | 58ccdfccefb467fe453ec65e1cea90a6e7f729af (diff) | |
| parent | 2bf59689a223fa026a2d2919f455ce100fe43480 (diff) | |
| download | tor-b440a4d9369c4a6c4501b289f2e6ff089ba9a519.tar tor-b440a4d9369c4a6c4501b289f2e6ff089ba9a519.tar.gz | |
Merge branch 'debian-merge' into debian
* debian-merge: (190 commits)
Forward port patches/06_add_compile_time_defaults.dpatch
Forward port patches/03_tor_manpage_in_section_8.dpatch
New upstream version
HiddenServiceVersion must be set to 2 currently.
put karsten's changelog in the right place
When Tor fails to parse a descriptor of any kind, dump it to disk.
update fetch-all with dir auth
changelog and spec changes for the .exit fix
bump to 0.2.2.1-alpha
typos in dir-spec
mark off a done proposal
clean up the changelog for 0.2.2.1-alpha
A changelog entry and a bit more documentation for socks-client
Clean up a couple of style issues in the socks-client branch.
new proposals: params in consensus, and lower circwindow
Add some fixes after discussion with Nick.
Refactor geoip_get_dirreq_history() some more.
Fix a memory leak in summarizing directory request timing.
Add the first 8 bytes of the git commit digest to our versions.
autoconf 2.59 appears not to support AC_PROG_SED
...
Diffstat (limited to 'src/win32/orconfig.h')
| -rw-r--r-- | src/win32/orconfig.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index 03e615850..aced48782 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -226,6 +226,5 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.2.1.19" - +#define VERSION "0.2.2.1-alpha" |