Merge remote-tracking branch 'origin/maint-0.2.2'

Conflicts:
	src/common/Makefile.am
	src/or/control.c

diff --cc src/common/Makefile.am
index 3a80eb80d4de2eb8bba3cc6253fe3165e8020d87,6952591d67037759701841a1d490c80c266e3e8f..48218491b5dd327e408e7a9a47ff5a4daa1b8ba8
--- 1/src/common/Makefile.am
--- 2/src/common/Makefile.am
+++ b/src/common/Makefile.am
@@@ -11,46 -11,12 +11,48 @@@ els
  libor_extra_source=
  endif
  
 -libor_a_SOURCES = address.c log.c util.c compat.c container.c mempool.c \
 -      memarea.c di_ops.c procmon.c util_codedigest.c $(libor_extra_source)
 -libor_crypto_a_SOURCES = crypto.c aes.c tortls.c torgzip.c
 +libor_a_SOURCES = \
 +  address.c                                   \
 +  compat.c                                    \
 +  container.c                                 \
 +  di_ops.c                                    \
 +  log.c                                               \
 +  memarea.c                                   \
 +  mempool.c                                   \
++  procmon.c                                   \
 +  util.c                                      \
 +  util_codedigest.c                           \
 +  $(libor_extra_source)
 +
 +libor_crypto_a_SOURCES = \
 +  aes.c               \
 +  crypto.c    \
 +  torgzip.c   \
 +  tortls.c
 +
  libor_event_a_SOURCES = compat_libevent.c
  
 -noinst_HEADERS = address.h torlog.h crypto.h util.h compat.h aes.h torint.h tortls.h strlcpy.c strlcat.c torgzip.h container.h ht.h mempool.h memarea.h ciphers.inc compat_libevent.h tortls_states.h di_ops.h procmon.h
 +noinst_HEADERS =                              \
 +  address.h                                   \
 +  aes.h                                               \
 +  ciphers.inc                                 \
 +  compat.h                                    \
 +  compat_libevent.h                           \
 +  container.h                                 \
 +  crypto.h                                    \
 +  di_ops.h                                    \
 +  ht.h                                                \
 +  memarea.h                                   \
 +  mempool.h                                   \
++  procmon.h                                   \
 +  strlcat.c                                   \
 +  strlcpy.c                                   \
 +  torgzip.h                                   \
 +  torint.h                                    \
 +  torlog.h                                    \
 +  tortls.h                                    \
 +  tortls_states.h                             \
 +  util.h
  
  common_sha1.i: $(libor_SOURCES) $(libor_crypto_a_SOURCES) $(noinst_HEADERS)
        if test "@SHA1SUM@" != none; then \

diff --cc src/common/compat.h
Simple merge

diff --cc src/common/compat_libevent.c
Simple merge

diff --cc src/common/log.c
Simple merge

diff --cc src/common/torlog.h
index b8f5ea45cb997471343a127292626424e29f0f40,541a0d1738c00b825719bd16870cedee6d458423..4c5729ef537fcb665ceb2ad4808547e82f3d4ffe
--- 1/src/common/torlog.h
--- 2/src/common/torlog.h
+++ b/src/common/torlog.h
@@@ -147,9 -145,7 +147,8 @@@ void change_callback_log_severity(int l
                                    log_callback cb);
  void flush_pending_log_callbacks(void);
  void log_set_application_name(const char *name);
 +void set_log_time_granularity(int granularity_msec);
  
- /* Outputs a message to stdout */
  void tor_log(int severity, log_domain_mask_t domain, const char *format, ...)
    CHECK_PRINTF(3,4);
  #define log tor_log /* hack it so we don't conflict with log() as much */

diff --cc src/common/util.c
Simple merge

diff --cc src/or/config.c
Simple merge

diff --cc src/or/connection.c
Simple merge

diff --cc src/or/control.c
index e0e8f7eee248d51337dcee6f9666d3e5983c5854,0dad1b9dfa49fa403d2429620fdd24104fee6f0e..98560733dba1b6c4f794addbacd1d012c7a9e81c
--- 1/src/or/control.c
--- 2/src/or/control.c
+++ b/src/or/control.c
@@@ -33,11 -32,8 +33,13 @@@
  #include "routerlist.h"
  #include "routerparse.h"
  
 +#ifndef MS_WINDOWS
 +#include <pwd.h>
 +#include <sys/resource.h>
 +#endif
 +
+ #include "procmon.h"
+ 
  /** Yield true iff <b>s</b> is the state of a control_connection_t that has
   * finished authentication and is accepting commands. */
  #define STATE_IS_OPEN(s) ((s) == CONTROL_CONN_STATE_OPEN)

diff --cc src/or/control.h
Simple merge

diff --cc src/or/or.h
Simple merge

diff --cc src/or/router.c
index 63ed4cf4046196a6beb30cd1f0ac5bac759b0112,184715b7501d11a6b3dd4cba2f9a103ef9b07a6e..2b11a5202623a3a4ebc81f676815e50144345eab
--- 1/src/or/router.c
--- 2/src/or/router.c
+++ b/src/or/router.c
@@@ -492,11 -490,11 +492,11 @@@ init_keys(void
    char fingerprint_line[MAX_NICKNAME_LEN+FINGERPRINT_LEN+3];
    const char *mydesc;
    crypto_pk_env_t *prkey;
-   char digest[20];
-   char v3_digest[20];
+   char digest[DIGEST_LEN];
+   char v3_digest[DIGEST_LEN];
    char *cp;
    or_options_t *options = get_options();
 -  authority_type_t type;
 +  dirinfo_type_t type;
    time_t now = time(NULL);
    trusted_dir_server_t *ds;
    int v3_digest_set = 0;